diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 08:44:56 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 08:44:56 +0200 |
| commit | c35447b875f6bd1a0edaa6838a3a09c854d56b28 (patch) | |
| tree | ef1c7597e7570123b3ee8972e66c22674206c0ef | |
| parent | 5a7b10e867542e5411d60a7a0e7440ced3c5f956 (diff) | |
| download | buildscripts-c35447b875f6bd1a0edaa6838a3a09c854d56b28.tar.gz buildscripts-c35447b875f6bd1a0edaa6838a3a09c854d56b28.tar.bz2 buildscripts-c35447b875f6bd1a0edaa6838a3a09c854d56b28.zip | |
bin/build-rpm-package: rename RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME to RPM_EXTRA_REPO_MOCK_CONFIG_BASE.
| -rwxr-xr-x | bin/build-rpm-package | 14 | ||||
| -rw-r--r-- | home/.buildscripts/x2go.conf | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 20f3d7d..47b5f25 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -33,7 +33,7 @@ OPENSUSE_DISTROS="12.2,12.3,13.1,13.2" SLE_DISTROS="11.2,11.3,12.0" RPM_REPOS_BASE=/var/www/ RPM_MOCK_CONFIG_DIR="" -RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME="" +RPM_EXTRA_REPO_MOCK_CONFIG_BASE="" RPM_EXTRA_REPO_MOCK_CONFIG_FULL_NAME="" @@ -290,13 +290,13 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET fi # Create temporary directory for our soon-to-be temporary mock config file. - TMP_MOCK_CFG_DIR="$(mktemp -d --tmpdir="${TEMP_BASE}" "${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}-mock-$(repeat_str "X" "24")")" + TMP_MOCK_CFG_DIR="$(mktemp -d --tmpdir="${TEMP_BASE}" "${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-mock-$(repeat_str "X" "24")")" if [ "$?" -ne "0" ]; then echo "Error: creating mock temporary config directory failed. Aborting." >&2 exit -1 fi - TMP_MOCK_CFG_FILE="$(mktemp --tmpdir="${TEMP_BASE}" "$(basename "${TMP_MOCK_CFG_DIR}")/${MOCK_BASE}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}-${COMPONENT}-${TARGET}.$(repeat_str "X" "24").cfg")" + TMP_MOCK_CFG_FILE="$(mktemp --tmpdir="${TEMP_BASE}" "$(basename "${TMP_MOCK_CFG_DIR}")/${MOCK_BASE}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-${COMPONENT}-${TARGET}.$(repeat_str "X" "24").cfg")" if [ "$?" -ne "0" ]; then echo "Error: creating mock temporary config file failed. Aborting." >&2 exit -1 @@ -311,8 +311,8 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET typeset -a full_repo typeset -i FETCH_EXTRA_SECTION=0 typeset -i FETCH_FULL_SECTION=0 - typeset TMP_REGEX_EXTRA="^[[:space:]]*\[[[:space:]]*${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}-extras-${DISTRO}[[:space:]]*\][[:space:]]*\$" - typeset TMP_REGEX_FULL="^[[:space:]]*\[[[:space:]]*${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}-${COMPONENT}-${DISTRO}[[:space:]]*\][[:space:]]*\$" + typeset TMP_REGEX_EXTRA="^[[:space:]]*\[[[:space:]]*${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-extras-${DISTRO}[[:space:]]*\][[:space:]]*\$" + typeset TMP_REGEX_FULL="^[[:space:]]*\[[[:space:]]*${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-${COMPONENT}-${DISTRO}[[:space:]]*\][[:space:]]*\$" typeset TMP_REGEX_OTHER='^[[:space:]]*\[.*\][[:space:]]*$' while read line; do @@ -422,8 +422,8 @@ get_extra_repository () { # Add mandatory, default value. ret="${ret}${DIST}-${CODENAME}-${ARCH}" - if [ -n "${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}" ]; then - ret="${ret}-${COMPONENT}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}" + if [ -n "${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}" ]; then + ret="${ret}-${COMPONENT}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}" if [ -n "${RPM_EXTRA_REPO_MOCK_CONFIG_FULL_NAME}" ] && [ -z "${PACKAGE_WITHOUT_OTHERMIRROR}" ] || \ [ "${PACKAGE_WITHOUT_OTHERMIRROR}" != "${PACKAGE}" ]; then diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index 757736d..57fa75b 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -17,7 +17,7 @@ RPM_DISTS_SUPPORTED="fedora epel opensuse sle" RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:18,19,20,21,rawhide epel:6 opensuse:12.2,12.3,13.1,13.2 sle:11.2,11.3,12.0"} RPM_REPOS_BASE=/srv/sites/x2go.org/packages/ RPM_MOCK_CONFIG_DIR="${HOME}/mock-config" -RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME="x2go" +RPM_EXTRA_REPO_MOCK_CONFIG_BASE="x2go" RPM_EXTRA_REPO_MOCK_CONFIG_FULL_NAME="full" COMPONENT_MAIN="main" |