[X2Go-Commits] [buildscripts] 03/04: bin/build-{nsis-package.sh, rpm-package}: remove common code by stuff in common.sh.
git-admin at x2go.org
git-admin at x2go.org
Sun May 10 05:52:32 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit df083c39f39edaf612512e17c9c3ec084ee85957
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun May 10 05:34:23 2015 +0200
bin/build-{nsis-package.sh,rpm-package}: remove common code by stuff in common.sh.
---
bin/build-nsis-package.sh | 2 +-
bin/build-rpm-package | 32 --------------------------------
2 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh
index abf3763..af2d5a1 100755
--- a/bin/build-nsis-package.sh
+++ b/bin/build-nsis-package.sh
@@ -31,7 +31,7 @@ typeset script_path="$(basename "$(readlink -e "${BASH_SOURCE}")")"
set -ex
-export PATH="${HOME}/bin:/cygdrive/d/Build/buildscripts/bin:${PATH}"
+export PATH="/cygdrive/d/Build/buildscripts/bin:${PATH}"
GIT_USER="x2go"
GIT_HOSTNAME="code.x2go.org"
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index fa2b445..b2ed316 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -127,20 +127,6 @@ cleanup () {
# Run cleanup() automatically.
trap cleanup ERR EXIT SIGTERM SIGINT SIGHUP SIGPIPE SIGALRM SIGUSR1 SIGUSR2
-# FIXME: this should really be in a common.(sh) file!
-function make_boolean () {
- typeset -l OPTION="${1}"
-
- case "${OPTION}" in
- ("0"|"no"|"false"|"") OPTION="0";;
- (*) OPTION="1";;
- esac
-
- printf "${OPTION}"
-
- return 0
-}
-
set_vars() {
mkdir -p -- "${TEMP_BASE}"
chmod 2770 "${TEMP_BASE}"
@@ -249,24 +235,6 @@ check_mock_version_atleast () {
fi
}
-# Repeats an input string.
-# Returns the repeated input string.
-repeat_str () { # INPUT COUNT
- typeset INPUT="${1:?"Error: no input string passed to ${FUNCNAME}()."}"
- typeset COUNT="${2:?"Error: no count passed to ${FUNCNAME}()."}"
-
- typeset ret=""
- typeset -i i=0
- while [ "${i}" -lt "${COUNT}" ]; do
- ret="${ret}$(printf "${INPUT}")"
- i=$(($i + 1))
- done
-
- printf "${ret}"
-
- return 0
-}
-
# Creates a custom mock config file given a base config (taken from
# /etc/mock/), the build component and the target specification ("full" or "base").
# Base refers to adding x2go-extras only, while full means also
--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
More information about the x2go-commits
mailing list