Skip to content

Commit a7042c7

Browse files
author
sam#gemmi-win10
committed
dist/x3 sync x11base
1 parent 0da29e4 commit a7042c7

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

distros/src/Dockerfile.apk-alpine

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ RUN apk add --no-cache \
8181
test "3.1" != "${VER}" && apk add --no-cache unzip; \
8282
match1=$(echo "${VER}" |grep -E "3.1$|3.2$"); \
8383
test -z "$match1" && apk add --no-cache shadow; \
84-
match2=$(echo "${VER}" |grep -E "3.1$|3.2$|3.5$"); \
84+
match2=$(echo "${VER}" |grep -E "3.1$|3.2$|3.5$|3.6$"); \
8585
test -z "$match2" && apk add --no-cache busybox-extras; \
8686
test "3.19" == "${VER}" && apk add --no-cache iputils-ping iproute2-ss; \
8787
test "3.19" == "${VER}" && chmod u+s /bin/ping; \
@@ -96,7 +96,8 @@ RUN apk add --no-cache \
9696
# v3.2: firefox (38.3.0-r0)
9797
# v3.5/v3.8: none-firefox
9898
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
99-
test "3.5" == "${VER}" && exit 0; \
99+
test "3.5" == "${VER}" && exit 0; \
100+
test "3.6" == "${VER}" && exit 0; \
100101
test "3.8" == "${VER}" && exit 0; \
101102
apk add --no-cache firefox; \
102103
exit 0;
@@ -117,8 +118,10 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall; \
117118
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
118119
apk add --no-cache \
119120
git \
120-
thunar geany ristretto; \
121-
test "3.8" != "${VER}" && apk add --no-cache gnome-system-monitor; \
121+
thunar geany ristretto xrandr ; \
122+
# 3.5$|
123+
match2=$(echo "${VER}" |grep -E "3.6$|3.8$"); \
124+
test -z "$match2" && apk add --no-cache gnome-system-monitor; \
122125
test "3.13" == "${VER}" && apk add --no-cache pavucontrol ; \
123126
test "3.19" == "${VER}" && apk add --no-cache pavucontrol ; \
124127
exit 0;

distros/src/Dockerfile.apt-ubuntu

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
187187

188188
# gparted
189189
# ubt14.04_none: pnmixer plank engrampa
190-
# xrandr: @x11-xserver-utils
190+
# pnmixer> pasystray
191+
# xrandr @x11-xserver-utils
191192
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
192-
apt.sh thunar dunst clipit \
193+
apt.sh thunar dunst clipit pasystray \
193194
pcmanfm lxappearance \
194195
sakura geany ristretto gnome-system-monitor; \
195196
# misc2
@@ -198,7 +199,7 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
198199
# ln -s /usr/bin/thunar /usr/bin/pcmanfm; \
199200
mv /usr/bin/st /usr/bin/st00; ln -s /usr/bin/sakura /usr/bin/st; \
200201
test "14.04" == "${VER}" && exit 0; \
201-
apt.sh pasystray plank engrampa; \
202+
apt.sh plank engrampa; \
202203
exit 0
203204

204205
# # wps: libxss1
@@ -220,9 +221,22 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
220221

221222
# OHMYBASH
222223
# git ohmybash # \12.6 MB
224+
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
225+
apt.sh git mousepad; \
226+
exit 0
227+
228+
# xrdb; +leafpad mousepad@app
229+
# 24.04_none: leafpad
230+
# xrandr: @x11-xserver-utils
231+
RUN \
232+
apt.sh x11-xserver-utils git mousepad scrot ; \
233+
test "24.04" != "${VER}" && apt.sh leafpad; \
234+
exit 0
235+
223236
# firefox: ubt2204+>> @snap: snap install firefox
224237
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
225-
apt.sh git mousepad scrot; \
238+
match1=$(echo "${VER}" |grep -E "22.04$|24.04$"); \
239+
test -z "$match1" && apt.sh firefox; \
226240
exit 0
227241

228242

distros/src/Dockerfile.zyp-opensuse

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
9393
# zyp-ex: clipit pnmixer
9494
# plank rofi clipit pnmixer lxappearance thunar \
9595
# tint2
96+
# pnmixer> pasystray
9697
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
9798
zyp.sh pavucontrol pasystray xrandr \
9899
ibus ibus-rime flameshot \

0 commit comments

Comments
 (0)