From 58edc3ee222c07f393114a84302147394d305c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Mon, 27 Feb 2023 02:39:07 +0100 Subject: [PATCH] Fix helper script download and script restarting for curl isntall --- .gitignore | 2 +- .msman/version.sh | 2 +- msman-hepler.tar.gz | Bin 2987 -> 0 bytes msman.sh | 11 +++++------ 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 msman-hepler.tar.gz diff --git a/.gitignore b/.gitignore index 9afca4b..73f39a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -msman-helper.tar.gz +msman-hepler.tar.gz diff --git a/.msman/version.sh b/.msman/version.sh index 55580a1..cf26aed 100644 --- a/.msman/version.sh +++ b/.msman/version.sh @@ -1,3 +1,3 @@ #!/bin/bash -EXTRA_SCRIPTS_VERSION="v1.1.3" +EXTRA_SCRIPTS_VERSION="v1.1.4" diff --git a/msman-hepler.tar.gz b/msman-hepler.tar.gz deleted file mode 100644 index 440844f030a5c5498f28b479c7f70c8439899f96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2987 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 diff --git a/msman.sh b/msman.sh index f18b224..4e30883 100755 --- a/msman.sh +++ b/msman.sh @@ -8,7 +8,7 @@ set -e # and acknowledge the original script and author. # ############################################################################################################# -CURRENT_SCRIPT_VERSION="v1.1.3" +CURRENT_SCRIPT_VERSION="v1.1.4" # -------------------------------------------------- # You shouldn't need to change anything in this file @@ -215,9 +215,10 @@ function helper_scripts_update { rm -rf .msman echo "Removed old script" echo "Moving new helper scripts into place..." - mv msman .msman + mv msman/.msman .msman echo "Removing temporary files..." rm msman-helper.tar.gz + rm -rf msman echo "Helper scripts updated successfully." echo echo @@ -317,8 +318,7 @@ function check_self_update { self_update CURRENT_VERSION=$LATEST_SCRIPT_VERSION check_helper_scripts - ScriptLoc=$(readlink -f "$0") - bash -c $ScriptLoc + bash -c $(pwd)/msman.sh else echo "Skipping update." return @@ -465,8 +465,7 @@ if [[ "$1" == "--redownload" ]] || [[ "$1" == "-r" ]]; then get_latest_script_release self_update # Reload the script - ScriptLoc=$(readlink -f "$0") - bash -c $ScriptLoc + bash -c $(pwd)/msman.sh exit 0 elif [[ "$1" == "--edit-config" ]] || [[ "$1" == "-e" ]]; then if ! command -v $EDITOR &> /dev/null; then