dist/opsuse: merge cmds; # COPY --from=ubt /usr/share/i18n /usr/share…

…/i18n

distros/src/Dockerfile.zyp-opensuse

@@ -14,7 +14,7 @@ FROM scratch AS res
   COPY --from=ubt /etc/fonts /etc/fonts
   # locale_ubt: /usr/sbin/locale-gen,update-locale; /etc/default/locale
   COPY --from=ubt /usr/share/locale /usr/share/locale
-  COPY --from=ubt /usr/share/i18n /usr/share/i18n
+  # COPY --from=ubt /usr/share/i18n /usr/share/i18n
   COPY --from=ubt /usr/sbin/locale-gen /usr/sbin/locale-gen
   COPY --from=ubt /usr/sbin/update-locale /usr/sbin/update-locale
   COPY --from=ubt /etc/locale.gen /etc/locale.gen
@@ -56,21 +56,19 @@ RUN \
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   zyp.sh firefox;
 
+# rm -f `ls |grep -v Ali `
+RUN cd /etc/zypp/repos.d && ls |grep -v Aliyun |while read one; do rm -f $one; done; \
+  find /etc/zypp/repos.d; \
+  exit 0;
 # greybird-gtk-theme
 # RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 #   zyp.sh papirus-icon-theme;
 
-
-# locales dconf-cli gtk2-engines-pixbuf x11-xkb-utils
-#  zyp-ex: tzdata dbus-x11
-RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  zyp.sh binutils at-spi2-core xdg-utils;
-
 # sakura+
 # zyp-ex: clipit pnmixer 
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   zyp.sh pavucontrol \
-  ibus flameshot \
+  ibus ibus-rime flameshot \
   sakura thunar lxappearance   geany ristretto engrampa gnome-system-monitor;
 
 # # fluxbox: /usr/share/fonts
@@ -90,36 +88,21 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   xfwm4 xfdesktop \
   xfce4-notifyd xfce4-settings xfce4-session;
 
-# xrdb font;
-RUN zyp.sh xrdb git; 
-
-# TODO: vim, locale, ping
-# ubt:iptuils-ping; vim 2.2M;
-RUN zyp.sh iputils vim; 
-
-# perp> xfce4-session: err
-# hand run> xfce4-session: ok
-# rm -f `ls |grep -v Ali `
-RUN cd /etc/zypp/repos.d && ls |grep -v Aliyun |while read one; do rm -f $one; done; \
-  find /etc/zypp/repos.d; \
-  exit 0;
-RUN zyp.sh dbus-1-x11;
-
+# locales dconf-cli gtk2-engines-pixbuf x11-xkb-utils
+#  zyp-ex: tzdata dbus-x11
 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  zyp.sh ibus-rime;
+  zyp.sh binutils at-spi2-core xdg-utils \
+  # lanpacks: rhel>> yum install langpacks-zh_CN;
+  glibc-locale \
+  # xrdb-font
+  xrdb git \
+  # vim, locale, ping; ubt:iptuils-ping; vim 2.2M;
+  iputils vim \
+  # dbus-x11: perp> xfce4-session: err #hand run> xfce4-session: ok
+  dbus-1-x11; \
+  # 01: chmod u+s /bin/ping #02: sudo setcap cap_net_raw+p /bin/ping #setcap 无指令
+  chmod u+s /bin/ping;
 
-# 01: chmod u+s /bin/ping
-# 02: sudo setcap cap_net_raw+p /bin/ping #setcap 无指令
-# glibc-locale: setlocale ok;
-# lanpacks: rhel>> yum install langpacks-zh_CN;
-RUN chmod u+s /bin/ping; \
-  zyp.sh glibc-locale; 
-
-# dbus-x11: not existed >> @dbus-1 installd.
-# dbg: xfce4-session>> dbus-launch not permitted.
-# # chmod 700 @xconf.sh
-# RUN chmod 777 /usr/bin/dbus-*; \
-#   exit 0;
 
 # HEADLESS
 COPY --from=rootfs /rootfs/files1 /