From 4c53de802d948bdbb19eeea5a2fc04e3f80aefca Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Fri, 21 May 2021 02:19:14 -0700 Subject: [PATCH] Fix for sed in increment_version.sh --- scripts/increment_version.sh | 3 ++- scripts/purge_wiki_history.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/increment_version.sh b/scripts/increment_version.sh index 815486a..298ef3c 100755 --- a/scripts/increment_version.sh +++ b/scripts/increment_version.sh @@ -9,7 +9,8 @@ if [[ "$(cat "$VERFILE")" =~ BOSL_VERSION.*=.*\[([0-9]+),\ *([0-9]+),\ *([0-9]+ echo "Current Version: $major.$minor.$revision" echo "New Version: $major.$minor.$new_revision" - sed -i 's/^BOSL_VERSION = .*$/BOSL_VERSION = ['"$major,$minor,$new_revision];/g" "$VERFILE" + sed -i.bak -e 's/^BOSL_VERSION = .*$/BOSL_VERSION = ['"$major,$minor,$new_revision];/g" "$VERFILE" + rm "$VERFILE".bak else echo "Could not extract version number from $VERFILE" >&2 exit 1 diff --git a/scripts/purge_wiki_history.sh b/scripts/purge_wiki_history.sh index d53e62d..7cef346 100755 --- a/scripts/purge_wiki_history.sh +++ b/scripts/purge_wiki_history.sh @@ -11,5 +11,6 @@ rm -rf .git git init git add . git commit -m "Purged wiki history." +git config pull.rebase false git remote add origin git@github.com:revarbat/BOSL2.wiki.git git push -u --force origin master