diff --git a/dist/2-ubuntu-build-deb.sh b/dist/2-ubuntu-build-deb.sh deleted file mode 100755 index e450059..0000000 --- a/dist/2-ubuntu-build-deb.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -export SCRIPTHOME=`pwd` - -. ./ubuntu-env.sh - -function createChangelog() { - export MYTS=`date "+%a, %d %b %Y %H:%M:%S"` - echo "Changelog timestamp: ${MYTS}" - echo -e "hh (${HHFULLVERSION}) ${UBUNTUVERSION}; urgency=low" > $1 - echo -e "\n" >> $1 - echo -e " * ${HHBZRMSG}" >> $1 - echo -e "\n" >> $1 - echo -e " -- Martin Dvorak (Dvorka) ${MYTS} +0100" >> $1 - echo -e "\n" >> $1 -} - -function createTarball() { - cd .. - mkdir work - cd work - cp -vrf ../${HH} . - rm -rvf ${HH}/.bzr - tar zcf ../${HH}.tgz ${HH} - cp -vf ../${HH}.tgz ../${HH}.orig.tar.gz - cd ../${HH} -} - -echo -e "\n_ hh deb build _______________________________________________\n" - -rm -rvf ../debian -cp -rvf ${HHSRC}/debian .. - -createChangelog ../debian/changelog - -cd ../.. -mv hh ${HH} -cd ${HH} -bzr add . -bzr commit -m "Update for ${HH} at ${NOW}." - -createTarball - -bzr builddeb -- -us -uc -bzr builddeb -S -cd ../build-area -pbuilder-dist ${UBUNTUVERSION} build ${HHRELEASE}.dsc - -# eof diff --git a/dist/3-ubuntu-push-deb.sh b/dist/3-ubuntu-push-deb.sh deleted file mode 100755 index 8cd2c2f..0000000 --- a/dist/3-ubuntu-push-deb.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -. ./ubuntu-env.sh - -cd .. -#bzr commit -m "Sync." -bzr push lp:~ultradvorka/+junk/hh-package -cd .. -#rm -rvf *.orig.tar.gz ./build-area/*.orig.tar.gz -dput ppa:ultradvorka ${HHRELEASE}_source.changes - -# eof diff --git a/dist/ubuntu-add-new-distro-base.sh b/dist/ubuntu-add-new-distro-base.sh new file mode 100755 index 0000000..76662aa --- /dev/null +++ b/dist/ubuntu-add-new-distro-base.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +export DISTRO=trusty + +sudo pbuilder --create $DISTRO +cp /var/cache/pbuilder/base.tgz ~/pbuilder/${DISTRO}-base.tgz + + +# eof diff --git a/dist/ubuntu-env.sh b/dist/ubuntu-env.sh deleted file mode 100755 index 170222b..0000000 --- a/dist/ubuntu-env.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -export HHVERSION="1.9.10" -export HHFULLVERSION=${HHVERSION}-0ubuntu1 -export HH=hh_${HHVERSION} -export HHRELEASE=hh_${HHFULLVERSION} -export HHSRC=/home/dvorka/p/hstr/github/hstr -export NOW=`date +%Y-%m-%d--%H-%M-%S` -export HHBUILD=hstr-${NOW} - -## https://wiki.ubuntu.com/Releases -#export UBUNTUVERSION=precise -#export UBUNTUVERSION=quantal -#export UBUNTUVERSION=saucy -export UBUNTUVERSION=trusty - -export HHBZRMSG="Favorites - favorite commands can be bookmarked and shown in a new view!" - -# - user email must be the same as in gpg i.e. (Dvorka) must present -# - hh_ must be with underscore (dh_make enforced) - -# eof diff --git a/dist/ubuntu-make-all-distros.sh b/dist/ubuntu-make-all-distros.sh new file mode 100755 index 0000000..e729a74 --- /dev/null +++ b/dist/ubuntu-make-all-distros.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +export HHBZRMSG="Favorites stabilization: deletion, reordering and highlighting." +export VERSION=1.11. +export MINOR=1 + +for DISTRO in precise quantal saucy trusty +do + +MINOR=`expr $MINOR + 1` + +./ubuntu-make-distro.sh ${DISTRO} ${VERSION}${MINOR} "${HHBZRMSG}" + +done + +# eof diff --git a/dist/ubuntu-make-distro.sh b/dist/ubuntu-make-distro.sh index 48ad9b5..82d7298 100755 --- a/dist/ubuntu-make-distro.sh +++ b/dist/ubuntu-make-distro.sh @@ -1,6 +1,27 @@ #!/bin/bash +# ubuntu-make-distro.sh [ubuntu version] [hh version] [change description] +# - ./ubuntu-make-distro.sh raring 1.9.5 "Fixed #25." +# - this script to be run from ./launchpad or other dir that allows: +# ../github/hstr +# -. /home/dvorka/p/hstr/github/hstr/dist/ubuntu-env.sh +export UBUNTUVERSION=$1 +export HHVERSION=$2 +export HHBZRMSG=$3 + +export HHFULLVERSION=${HHVERSION}-0ubuntu1 +export HH=hh_${HHVERSION} +export HHRELEASE=hh_${HHFULLVERSION} +export HHSRC=/home/dvorka/p/hstr/github/hstr +export NOW=`date +%Y-%m-%d--%H-%M-%S` +export HHBUILD=hstr-${NOW} +## https://wiki.ubuntu.com/Releases +#export UBUNTUVERSION=precise +#export UBUNTUVERSION=quantal +#export UBUNTUVERSION=saucy +#export UBUNTUVERSION=trusty + +# checkout hh from bazaar and make hstr ################################ function checkout_hh() { bzr checkout lp:~ultradvorka/+junk/hh-package @@ -38,11 +59,64 @@ cd ${HHBUILD} checkout_hh `pwd` cd hh/dist -./2-ubuntu-build-deb.sh -pwd -#echo -e "\n\nFinish by running 3-ubuntu-push-deb.sh\n" -./3-ubuntu-push-deb.sh +# build .deb for Ubuntu ############################################################# +# ./2-ubuntu-build-deb.sh +export SCRIPTHOME=`pwd` + +function createChangelog() { + export MYTS=`date "+%a, %d %b %Y %H:%M:%S"` + echo "Changelog timestamp: ${MYTS}" + echo -e "hh (${HHFULLVERSION}) ${UBUNTUVERSION}; urgency=low" > $1 + echo -e "\n" >> $1 + echo -e " * ${HHBZRMSG}" >> $1 + echo -e "\n" >> $1 + echo -e " -- Martin Dvorak (Dvorka) ${MYTS} +0100" >> $1 + echo -e "\n" >> $1 +} + +function createTarball() { + cd .. + mkdir work + cd work + cp -vrf ../${HH} . + rm -rvf ${HH}/.bzr + tar zcf ../${HH}.tgz ${HH} + cp -vf ../${HH}.tgz ../${HH}.orig.tar.gz + cd ../${HH} +} + +echo -e "\n_ hh deb build _______________________________________________\n" + +rm -rvf ../debian +cp -rvf ${HHSRC}/debian .. + +createChangelog ../debian/changelog + +cd ../.. +mv hh ${HH} +cd ${HH} +bzr add . +bzr commit -m "Update for ${HH} at ${NOW}." + +createTarball + +bzr builddeb -- -us -uc +bzr builddeb -S +cd ../build-area +pbuilder-dist ${UBUNTUVERSION} build ${HHRELEASE}.dsc + +# push .deb to Launchpad ######################################################## +#./3-ubuntu-push-deb.sh + +# from buildarea/ to ./dist +cd ../${HH} + +echo "Before bzr push: " `pwd` +bzr push lp:~ultradvorka/+junk/hh-package +cd .. +echo "Before dput push: " `pwd` +dput ppa:ultradvorka ${HHRELEASE}_source.changes # eof diff --git a/dist/ubuntu-refresh-all-pbuilder.sh b/dist/ubuntu-refresh-all-pbuilder.sh new file mode 100755 index 0000000..cf50bbe --- /dev/null +++ b/dist/ubuntu-refresh-all-pbuilder.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +for DISTRO in precise quantal saucy trusty +do + +sudo pbuilder --create ${DISTRO} + +done + +# eof