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