diff options
| author | François Andriot <[email protected]> | 2018-12-02 11:45:46 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2018-12-02 21:48:19 +0100 |
| commit | c39ca964b3288690923cdb4e63275aebd334e4e2 (patch) | |
| tree | 32ce3b08f70ef3c731f4bf9d46f7de8152163f4e /redhat/buildenv.sh | |
| parent | 513bfad2d12c9454d8c232ed4a18929924f9c6f6 (diff) | |
| download | tde-packaging-c39ca964b3288690923cdb4e63275aebd334e4e2.tar.gz tde-packaging-c39ca964b3288690923cdb4e63275aebd334e4e2.zip | |
RPM: update build scripts
Diffstat (limited to 'redhat/buildenv.sh')
| -rw-r--r-- | redhat/buildenv.sh | 15 |
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" |