diff --git a/linupx-scripts.sh b/linupx-scripts.sh index 0cc4c1d..e191b0d 100755 --- a/linupx-scripts.sh +++ b/linupx-scripts.sh @@ -13,23 +13,10 @@ if [ -d /opt/idssys/LinUPx ]; then mv /opt/LinUPx /opt/idssys/linupx rm -f /usr/local/bin/runup ln -s /opt/idssys/linupx/run.sh /usr/local/bin/runup - if [ -f /opt/idssys/linupx/settings.conf ]; then - if [ ! -d /opt/idssys/settings ]; then - mkdir /opt/idssys/settings - fi - mv /opt/idssys/linupx/settings.conf /opt/idssys/settings/linupx.conf - fi echo "Program has been updated, please re-run" exit 0 fi -if [ -f /opt/idssys/linupx/settings.conf ]; then - if [ ! -d /opt/idssys/settings ]; then - mkdir /opt/idssys/settings - fi - mv /opt/idssys/linupx/settings.conf /opt/idssys/settings/linupx.conf -fi - if [ ! -d "/opt/idssys/linupx" ]; then if [ ! -d /opt/idssys ]; then mkdir /opt/idssys @@ -45,7 +32,7 @@ if [ ! -d "/opt/idssys/defaults" ]; then git clone https://git.schroedercity.com/voltron/iDS-Defaults.git /opt/idssys/defaults fi -source /opt/idssys/settings/linupx.conf +source /opt/idssys/linupx/settings.conf source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc diff --git a/run.sh b/run.sh index 9d65d82..a343031 100755 --- a/run.sh +++ b/run.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash # UbUpdate - Ubuntu Update Scripts Loader - -if [ ! -f /opt/idssys/settings/linupx.conf ]; then - source /opt/idssys/linupx/settings.conf -else - source /opt/idssys/settings/linupx.conf +if [ -f /opt/idssys/settings/linupx.conf ]; then + mv /opt/idssys/settings/linupx.conf /opt/idssys/linupx/settings.conf fi + +source /opt/idssys/linupx/settings.conf source /opt/idssys/defaults/colors.inc if curl -m 15 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then