Skip to content
This repository has been archived by the owner on Sep 8, 2023. It is now read-only.

Commit

Permalink
Fix updating helper scripts after script update
Browse files Browse the repository at this point in the history
  • Loading branch information
jiriks74 committed Feb 27, 2023
1 parent 5b637cf commit b12f458
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .msman/version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

EXTRA_SCRIPTS_VERSION="v1.1.7"
EXTRA_SCRIPTS_VERSION="v1.1.8"
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
MAKEFLAGS += -s

all:
CURRENT_SCRIPT_VERSION=`grep "CURRENT_SCRIPT_VERSION=" msman.sh | sed -e "s/CURRENT_SCRIPT_VERSION=//g"`; \
EXTRA_VERSION=`grep "EXTRA_SCRIPTS_VERSION=" .msman/version.sh | sed -e "s/EXTRA_SCRIPTS_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" | sed '$d'`; \
if [ "$$CURRENT_SCRIPT_VERSION" != "$$EXTRA_VERSION" ]; then \
echo "ERROR: The version in msman.sh and .msman/version.sh are not the same!"; \
echo "ERROR: Please make sure they are the same."; \
Expand Down
4 changes: 2 additions & 2 deletions msman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -e
# 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
Expand Down Expand Up @@ -319,7 +319,7 @@ function check_self_update {
read -t 15 -p "Do you want to update? [y/N] " update
if [ "$update" == "y" ] || [ "$update" == "Y" ]; then
self_update
CURRENT_VERSION=$LATEST_SCRIPT_VERSION
CURRENT_SCRIPT_VERSION=$LATEST_SCRIPT_VERSION
check_helper_scripts
bash -c "$(pwd)/msman.sh"
else
Expand Down

0 comments on commit b12f458

Please sign in to comment.