jiriks74/msman.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 20 Wiki Activity

Fix updating helper scripts after script update

Browse Source
This commit is contained in:
Jiří Štefka 2023-02-27 03:32:43 +01:00
parent 5b637cf84d
commit b12f4589f5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.msman/version.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
EXTRA_SCRIPTS_VERSION="v1.1.7" EXTRA_SCRIPTS_VERSION="v1.1.8"

4
Makefile
View File

@ -3,8 +3,8 @@
MAKEFLAGS += -s MAKEFLAGS += -s
all: all:
CURRENT_SCRIPT_VERSION=`grep "CURRENT_SCRIPT_VERSION=" msman.sh | sed -e "s/CURRENT_SCRIPT_VERSION=//g"`; \ CURRENT_SCRIPT_VERSION=`grep "CURRENT_SCRIPT_VERSION=" msman.sh | sed -e "s/CURRENT_SCRIPT_VERSION=//g" | sed '$d'`; \
EXTRA_VERSION=`grep "EXTRA_SCRIPTS_VERSION=" .msman/version.sh | sed -e "s/EXTRA_SCRIPTS_VERSION=//g"`; \ EXTRA_VERSION=`grep "EXTRA_SCRIPTS_VERSION=" .msman/version.sh | sed -e "s/EXTRA_SCRIPTS_VERSION=//g" | sed '$d'`; \
if [ "$$CURRENT_SCRIPT_VERSION" != "$$EXTRA_VERSION" ]; then \ if [ "$$CURRENT_SCRIPT_VERSION" != "$$EXTRA_VERSION" ]; then \
echo "ERROR: The version in msman.sh and .msman/version.sh are not the same!"; \ echo "ERROR: The version in msman.sh and .msman/version.sh are not the same!"; \
echo "ERROR: Please make sure they are the same."; \ echo "ERROR: Please make sure they are the same."; \

4
msman.sh
View File

@ -8,7 +8,7 @@ set -e
# and acknowledge the original script and author. # # and acknowledge the original script and author. #
############################################################################################################# #############################################################################################################
CURRENT_SCRIPT_VERSION="v1.1.7" CURRENT_SCRIPT_VERSION="v1.1.8"
# -------------------------------------------------- # --------------------------------------------------
# You shouldn't need to change anything in this file # You shouldn't need to change anything in this file
@ -319,7 +319,7 @@ function check_self_update {
read -t 15 -p "Do you want to update? [y/N] " update read -t 15 -p "Do you want to update? [y/N] " update
if [ "$update" == "y" ] || [ "$update" == "Y" ]; then if [ "$update" == "y" ] || [ "$update" == "Y" ]; then
self_update self_update
CURRENT_VERSION=$LATEST_SCRIPT_VERSION CURRENT_SCRIPT_VERSION=$LATEST_SCRIPT_VERSION
check_helper_scripts check_helper_scripts
bash -c "$(pwd)/msman.sh" bash -c "$(pwd)/msman.sh"
else else