Настроил автовход для дефолтного пользователя с дефолтным паролем.\nИзменил условия вывода иконок установки системы

master
Dmitry Razumov 3 years ago
parent e6d3eb76f6
commit 24541fc403

@ -15,9 +15,9 @@ DEBUGMODE=no
debug_mode "$0" "$@" debug_mode "$0" "$@"
INSTALLDESKTOP="ubinstall;ubinstall.cli" INSTALLDESKTOP="ubinstall;ubinstall.cli"
echo "$INSTALLDESKTOP" | tr ',;' \\n | while read i; do echo "${INSTALLDESKTOP}" | tr ',;' \\n | while read i; do
if [ -f usr/share/applications/"${i}".desktop ]; then if [[ -f usr/share/applications/"${i}".desktop ]]; then
if ! [ -w /memory/layer-base/0 -o -d /mnt/livedata -o -w /mnt/livemedia ]; 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 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 . bash -c "xdg-user-dirs-update && xdg-user-dir DESKTOP | cut -d/ -f3")
DESKTOPNAME=$(chroot . gettext -d xdg-user-dirs "Desktop") DESKTOPNAME=$(chroot . gettext -d xdg-user-dirs "Desktop")
@ -29,9 +29,9 @@ echo "$INSTALLDESKTOP" | tr ',;' \\n | while read i; do
fi fi
done done
if [ -f etc/ublinux/steam ] ;then if [[ -f etc/ublinux/steam ]] ;then
. etc/ublinux/steam . etc/ublinux/steam
rm -f etc/skel/.steam etc/skel/.local/share/Steam 2>/dev/null rm -f etc/skel/.steam etc/skel/.local/share/Steam 2>/dev/null
[ -z "$STEAMCONF" ] || ln -sf "$STEAMCONF" etc/skel/.steam [[ -z "$STEAMCONF" ]] || ln -sf "$STEAMCONF" etc/skel/.steam
[ -z "$STEAMAPP" ] || ln -sf "$STEAMAPP" etc/skel/.local/share/Steam [[ -z "$STEAMAPP" ]] || ln -sf "$STEAMAPP" etc/skel/.local/share/Steam
fi fi

Loading…
Cancel
Save