From 24541fc403798fc75fbe0c0127396f854f7935db Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Tue, 23 May 2023 19:46:45 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B2=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D1=81=20=D0=B4=D0=B5=D1=84?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=82=D0=BD=D1=8B=D0=BC=20=D0=BF=D0=B0=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BC.\n=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ublinux/rc.preinit/02-skel-adds | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ublinux/rc.preinit/02-skel-adds b/ublinux/rc.preinit/02-skel-adds
index 3dab780..bbe59a7 100755
--- a/ublinux/rc.preinit/02-skel-adds
+++ b/ublinux/rc.preinit/02-skel-adds
@@ -15,9 +15,9 @@ DEBUGMODE=no
 debug_mode "$0" "$@"
 
 INSTALLDESKTOP="ubinstall;ubinstall.cli"
-echo "$INSTALLDESKTOP" | tr ',;' \\n | while read i; do
-    if [ -f usr/share/applications/"${i}".desktop ]; then
-	if ! [ -w /memory/layer-base/0 -o -d /mnt/livedata -o -w /mnt/livemedia ]; then
+echo "${INSTALLDESKTOP}" | tr ',;' \\n | while read i; do
+    if [[ -f usr/share/applications/"${i}".desktop ]]; then
+	if ! [[ -w /memory/layer-base/0 || -d /mnt/livedata || -w /mnt/livemedia ]] || grep -q "ub.sgnfiles=.*-iso.sgn" /proc/cmdline; then
 	    if ! grep -q ^Hidden=true usr/share/applications/"${i}".desktop ; then
 #		DESKTOPNAME=$(chroot . bash -c "xdg-user-dirs-update && xdg-user-dir DESKTOP | cut -d/ -f3")
 		DESKTOPNAME=$(chroot . gettext -d xdg-user-dirs "Desktop")
@@ -29,9 +29,9 @@ echo "$INSTALLDESKTOP" | tr ',;' \\n | while read i; do
     fi
 done
 
-if [ -f etc/ublinux/steam ] ;then
+if [[ -f etc/ublinux/steam ]] ;then
   . etc/ublinux/steam
   rm -f etc/skel/.steam etc/skel/.local/share/Steam 2>/dev/null
-  [ -z "$STEAMCONF" ] || ln -sf "$STEAMCONF" etc/skel/.steam
-  [ -z "$STEAMAPP"  ] || ln -sf "$STEAMAPP"  etc/skel/.local/share/Steam
+  [[ -z "$STEAMCONF" ]] || ln -sf "$STEAMCONF" etc/skel/.steam
+  [[ -z "$STEAMAPP"  ]] || ln -sf "$STEAMAPP"  etc/skel/.local/share/Steam
 fi