From b96fbc1b9ef1cf167e72d25523be1e0424ad2129 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 22 Sep 2014 22:13:50 +0200 Subject: [PATCH] [Project] fixing release.sh script --- li.strolch.dev/release.sh | 11 ++++------- li.strolch.dev/setVersion.sh | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/li.strolch.dev/release.sh b/li.strolch.dev/release.sh index 05a6913cb..e46258321 100755 --- a/li.strolch.dev/release.sh +++ b/li.strolch.dev/release.sh @@ -43,10 +43,10 @@ if [ -z "${r}" ] || [ -z "${b}" ] || [ -z "${o}" ] || [ -z "${n}" ] ; then usage fi -#if [ "$(git status --short)" != "" ] ; then -# echo "You have uncommitted changes!" -# exit 1 -#fi +if [ "$(git status --short)" != "" ] ; then + echo "You have uncommitted changes!" + exit 1 +fi declare SCRIPT_NAME="${0##*/}" @@ -78,7 +78,6 @@ else echo "NOT pusing to origin." fi -echo "" echo "" function fail() { @@ -132,8 +131,6 @@ if [ $? -ne 0 ] ; then fail fi -echo aaaa -exit 1 # show status echo -e "\nINFO: Git Status:" diff --git a/li.strolch.dev/setVersion.sh b/li.strolch.dev/setVersion.sh index d36ef147a..16ac3a456 100755 --- a/li.strolch.dev/setVersion.sh +++ b/li.strolch.dev/setVersion.sh @@ -87,7 +87,7 @@ done cd "${root}" -if ! sed --in-place "s/${old_version}/${new_version}/" li.strolch.dev/createBundle.sh 2>/dev/null ; then +if ! sed -i.bck "s/${old_version}/${new_version}/" "li.strolch.dev/createBundle.sh" 2>/dev/null ; then fail "${root}/li.strolch.dev/createBundle.sh" fi