summaryrefslogtreecommitdiffstats
path: root/redhat/buildenv.sh
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-12-02 11:45:46 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-12-02 21:49:02 +0100
commitfbc6de58500b5037b6a8dc3795d55b0d1286d512 (patch)
treeb681e0f3dd40a077f49987eb9ae97f9ded950232 /redhat/buildenv.sh
parentfea0292e6ba6312d462321aaf695999a7fe6f50a (diff)
downloadtde-packaging-fbc6de58500b5037b6a8dc3795d55b0d1286d512.tar.gz
tde-packaging-fbc6de58500b5037b6a8dc3795d55b0d1286d512.zip
RPM: update build scripts
Diffstat (limited to 'redhat/buildenv.sh')
-rw-r--r--redhat/buildenv.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 029f29afa..13304eb05 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -2,13 +2,14 @@
# This file can be sourced in your .bashrc
-TDE_BASEDIR=~/tde
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+TDE_BASEDIR="${HOME}/tde"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
-TDE_GITBASESRC=${TDE_BASEDIR}/tde.master
-TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging.master/redhat
-TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
+TDE_GITBASESRC=${TDE_BASEDIR}/${BRANCH}/tde
+[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR="${TDE_BASEDIR}/${BRANCH}/tde-packaging"
+TDE_GITBASEPKG="${TDE_PACKAGING_DIR}/redhat"
+TDE_TARBALLS="${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}"
-[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging.master
export PATH="${PATH}:${TDE_GITBASEPKG}/build"
@@ -16,7 +17,7 @@ export PATH="${PATH}:${TDE_GITBASEPKG}/build"
export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
# Go to the RPMS folder
-alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
+alias cdrpm='cd ${HOME}/rpmbuild/RPMS/RPMS${DIST}'
# Build a single tarball (execute from GIT directory)
alias tdp4='TARGET=${TDE_VERSION} SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
@@ -31,7 +32,7 @@ alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; expo
alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
# Build a single package
-alias cdp='cd ~/tde/tde-packaging/redhat'
+alias cdp='cd $HOME/tde/tde-packaging/redhat'
grp3() {
build_rpm_package.sh "${1}" "3.5.13.2"