safebox/installer-tool
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 'install.sh'

Browse Source 
Changed checking conditions order
This commit is contained in:
Gyorgy Berenyi
2023-07-13 09:09:32 +00:00
parent 8759f66d8d
commit 722c0601c1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
install.sh
View File

@@ -110,17 +110,6 @@ check_dirs_and_files() {
chmod 0600 $HOME/.ssh/installer.pub; chmod 0600 $HOME/.ssh/installer.pub;
fi; fi;
if [ ! -f /etc/wsl.conf ]; then
$SUDO_CMD touch /etc/wsl.conf;
fi
SYSTEM_SETTINGS=$($SUDO_CMD grep -Pzow '\[boot\]\nsystemd\=true' /etc/wsl.conf);
if [ "$SYSTEM_SETTINGS" == "" ]; then
$SUDO_CMD echo "[boot]
systemd=true" >> /etc/wsl.conf;
echo "Not corresponding wsl configuration found, modified and need a WSL system restart from Windows terminal";
fi
if [ ! -d "/etc/user/config" ]; then if [ ! -d "/etc/user/config" ]; then
$SUDO_CMD mkdir -p "/etc/user/config" $SUDO_CMD mkdir -p "/etc/user/config"
fi; fi;
@@ -463,6 +452,17 @@ if [ "$1" == "remove" ]; then
exit; exit;
fi; # else run install fi; # else run install
if [ ! -f /etc/wsl.conf ]; then
$SUDO_CMD touch /etc/wsl.conf;
fi
SYSTEM_SETTINGS=$($SUDO_CMD grep -Pzow '\[boot\]\nsystemd\=true' /etc/wsl.conf);
if [ "$SYSTEM_SETTINGS" == "" ]; then
$SUDO_CMD echo "[boot]
systemd=true" >> /etc/wsl.conf;
echo "Not corresponding wsl configuration found, modified and need a WSL system restart from Windows terminal";
fi
echo "Would you like to install/update docker? (y/N)"; echo "Would you like to install/update docker? (y/N)";
read -r ANSWER; read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then