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

shopt outside of if

Browse Source
This commit is contained in:
hael
2023-06-19 12:06:06 +00:00
parent 50e291de5b
commit de5360910a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
install.sh
View File

@@ -348,6 +348,8 @@ fi;
# first install
if [ ! -f "/etc/user/config/system.json" ]; then
INIT="true";
echo "Would you like to install/update docker? (y/N)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then
@@ -364,7 +366,7 @@ if [ ! -f "/etc/user/config/system.json" ]; then
check_dirs_and_files;
ask_envs;
discover_services;
$SUDO_CMD docker pull registry.format.hu/installer-tool
@@ -424,11 +426,15 @@ if [ ! -f "/etc/user/config/system.json" ]; then
--volume /etc/system/:/etc/system/ \
--env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL registry.format.hu/installer-tool
fi;
# test - alias doesn't work inside a function
# must be outside of if
shopt -s expand_aliases
source $HOME/.bash_aliases
if [ "$INIT" == "true" ]; then
INIT_SERVICE_PATH=/etc/user/config/services
type -a service-debian
@@ -494,9 +500,9 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud"
fi;
ADDITIONAL_SERVICES="";
echo "Would you like to run Nextcloud after install? (Y/n)";
read -r ANSWER;
ADDITIONAL_SERVICES="";
echo "Would you like to run Nextcloud after install? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES nextcloud";
fi