ouroboros-gorup/obosdi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update makerelease

Browse source
This commit is contained in:
MatMoul 2015-08-29 23:44:36 +02:00
parent 135b94c85e
commit ca03fe2cf4
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archdi
View file

@ -56,7 +56,7 @@ run(){
if [ "$branchoption" = "" ]; then if [ "$branchoption" = "" ]; then
./lib --root ./lib --root
else 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 sed -i "/baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$branchoption" lib
./lib --root ./lib --root
fi fi

10
makerelease
View file

@ -35,7 +35,7 @@ echo "Building version $version..."
echo "" echo ""
echo "Finalise archdi script..." 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 sed -i /version=/c\version=\""$version"\" archdi
echo "Set version..." echo "Set version..."
@ -50,9 +50,9 @@ if [ ! "$branch" = "master" ]; then
git checkout master git checkout master
git merge $branch git merge $branch
read -p "Delete branch $branch ? (Y/n)" choice read -p "Delete branch $branch ? (y/N)" choice
case "$choice" in case "$choice" in
y|Y|'' ) y|Y )
git branch -D $branch git branch -D $branch
;; ;;
esac 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 scp version matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/version
rm -R .build rm -R .build
if [ ! "$branch" = "master" ]; then
git checkout $branch
fi