Merge branch 'src'
This commit is contained in:
commit
af35780e69
3 changed files with 10 additions and 6 deletions
8
archdi
8
archdi
|
@ -12,8 +12,8 @@
|
|||
|
||||
|
||||
|
||||
apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.08.29.23.30.04 (GPLv3)"
|
||||
version="2015.08.29.23.30.04"
|
||||
apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.08.29.23.44.51 (GPLv3)"
|
||||
version="2015.08.29.23.44.51"
|
||||
cachedir=~/.cache/archdi
|
||||
|
||||
lastverurl1=http://archdi.sourceforge.net/version
|
||||
|
@ -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
|
||||
|
@ -139,7 +139,7 @@ while (( "$#" )); do
|
|||
liburl1=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib
|
||||
liburl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib
|
||||
branchoption="$1"
|
||||
apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.08.29.23.30.04 (GPLv3)"
|
||||
apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.08.29.23.44.51 (GPLv3)"
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
|
|
|
@ -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..."
|
||||
|
@ -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
|
||||
|
|
2
version
2
version
|
@ -1 +1 @@
|
|||
2015.08.29.23.30.04
|
||||
2015.08.29.23.44.51
|
||||
|
|
Loading…
Reference in a new issue