diff --git a/archdi b/archdi index 307aac3..52db152 100644 --- a/archdi +++ b/archdi @@ -56,7 +56,7 @@ run(){ if [ "$branchoption" = "" ]; then ./lib --root else -apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.08.29.23.30.04 (GPLv3)" + sed -i "/apptitle=/c\apptitle=\"Arch Linux Desktop Install (archdi) - Branch: $branchoption (GPLv3)\"" lib sed -i "/baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$branchoption" lib ./lib --root fi diff --git a/makerelease b/makerelease index e688ff2..6bb2be4 100644 --- a/makerelease +++ b/makerelease @@ -35,7 +35,7 @@ echo "Building version $version..." echo "" echo "Finalise archdi script..." -sed -i /apptitle=/c\apptitle=\""Arch Linux Desktop Install (archdi) - Version: $version (GPLv3)"\" archdi +sed -i /^apptitle=/c\apptitle=\""Arch Linux Desktop Install (archdi) - Version: $version (GPLv3)"\" archdi sed -i /version=/c\version=\""$version"\" archdi echo "Set version..." @@ -50,9 +50,9 @@ if [ ! "$branch" = "master" ]; then git checkout master git merge $branch - read -p "Delete branch $branch ? (Y/n)" choice + read -p "Delete branch $branch ? (y/N)" choice case "$choice" in - y|Y|'' ) + y|Y ) git branch -D $branch ;; esac @@ -98,3 +98,7 @@ scp $pubfile matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/$prjn scp version matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/version rm -R .build + +if [ ! "$branch" = "master" ]; then + git checkout $branch +fi