dist/x3 sync x11base

infrastlabs · Nov 3, 2024 · a7042c7 · a7042c7
1 parent 0da29e4
commit a7042c7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/distros/src/Dockerfile.apk-alpine b/distros/src/Dockerfile.apk-alpine
@@ -81,7 +81,7 @@ RUN apk add --no-cache \
   test "3.1" != "${VER}" && apk add --no-cache unzip; \
   match1=$(echo "${VER}" |grep -E "3.1$|3.2$"); \
   test -z "$match1" && apk add --no-cache shadow; \
-  match2=$(echo "${VER}" |grep -E "3.1$|3.2$|3.5$"); \
+  match2=$(echo "${VER}" |grep -E "3.1$|3.2$|3.5$|3.6$"); \
   test -z "$match2" && apk add --no-cache busybox-extras; \
   test "3.19" == "${VER}" && apk add --no-cache iputils-ping iproute2-ss; \
   test "3.19" == "${VER}" && chmod u+s /bin/ping; \
@@ -96,7 +96,8 @@ RUN apk add --no-cache \
 # v3.2: firefox (38.3.0-r0)
 # v3.5/v3.8: none-firefox
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  test "3.5" == "${VER}" && exit 0; \  
+  test "3.5" == "${VER}" && exit 0; \ 
+  test "3.6" == "${VER}" && exit 0; \  
   test "3.8" == "${VER}" && exit 0; \
   apk add --no-cache firefox; \
   exit 0;
@@ -117,8 +118,10 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall; \
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   apk add --no-cache \
   git \
-  thunar geany ristretto; \
-  test "3.8" != "${VER}" && apk add --no-cache gnome-system-monitor; \
+  thunar geany ristretto xrandr ; \
+  # 3.5$|
+  match2=$(echo "${VER}" |grep -E "3.6$|3.8$"); \
+  test -z "$match2" && apk add --no-cache gnome-system-monitor; \
   test "3.13" == "${VER}" && apk add --no-cache pavucontrol ; \
   test "3.19" == "${VER}" && apk add --no-cache pavucontrol ; \
   exit 0;

diff --git a/distros/src/Dockerfile.apt-ubuntu b/distros/src/Dockerfile.apt-ubuntu
@@ -187,9 +187,10 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 
 # gparted
 # ubt14.04_none: pnmixer plank engrampa
-# xrandr: @x11-xserver-utils
+# pnmixer> pasystray
+# xrandr @x11-xserver-utils
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  apt.sh thunar dunst clipit \
+  apt.sh thunar dunst clipit pasystray \
   pcmanfm lxappearance \
   sakura geany ristretto gnome-system-monitor; \
   # misc2
@@ -198,7 +199,7 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   # ln -s /usr/bin/thunar /usr/bin/pcmanfm; \
   mv /usr/bin/st /usr/bin/st00; ln -s /usr/bin/sakura /usr/bin/st; \
   test "14.04" == "${VER}" && exit 0; \
-  apt.sh pasystray plank engrampa; \
+  apt.sh plank engrampa; \
   exit 0
 
   # # wps: libxss1
@@ -220,9 +221,22 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 
 # OHMYBASH
 # git ohmybash # \12.6 MB
+RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
+  apt.sh git mousepad; \
+  exit 0
+
+# xrdb; +leafpad mousepad@app
+# 24.04_none: leafpad
+# xrandr: @x11-xserver-utils
+RUN \
+  apt.sh x11-xserver-utils git mousepad scrot ; \
+  test "24.04" != "${VER}" && apt.sh leafpad; \
+  exit 0
+
 # firefox: ubt2204+>> @snap: snap install firefox
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  apt.sh git mousepad scrot; \
+  match1=$(echo "${VER}" |grep -E "22.04$|24.04$"); \
+  test -z "$match1" && apt.sh firefox; \
   exit 0
 
 

diff --git a/distros/src/Dockerfile.zyp-opensuse b/distros/src/Dockerfile.zyp-opensuse
@@ -93,6 +93,7 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 # zyp-ex: clipit pnmixer 
 # plank rofi clipit pnmixer lxappearance thunar \
 # tint2
+# pnmixer> pasystray
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   zyp.sh pavucontrol pasystray xrandr \
   ibus ibus-rime flameshot \