diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 08:14:17 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 08:14:17 +0200 |
| commit | a4926c29ecd09ab655a2dff35af057334ad67d81 (patch) | |
| tree | 750ad106bb13b198fdd97507178feca3149e6216 | |
| parent | 2b13ca64c90372ffb28d2565fb13447240ced016 (diff) | |
| download | buildscripts-a4926c29ecd09ab655a2dff35af057334ad67d81.tar.gz buildscripts-a4926c29ecd09ab655a2dff35af057334ad67d81.tar.bz2 buildscripts-a4926c29ecd09ab655a2dff35af057334ad67d81.zip | |
bin/build-rpm-package: use single quotes where more appropriate for regex variables, escape single dollar sign in double quoted regex variable strings.
| -rwxr-xr-x | bin/build-rpm-package | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 44384bd..4d8676c 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -265,7 +265,7 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET done typeset DISTRO="" - typeset TMP_REGEX="^([[:alpha:]]+)-[[:alnum:]]+-[[:alnum:]].cfg$" + typeset TMP_REGEX='^([[:alpha:]]+)-[[:alnum:]]+-[[:alnum:]].cfg$' # distribution - version - arch if [[ ! "${MOCK_BASE}" =~ ${TMP_REGEX} ]]; then echo "Error: MOCK_BASE parameter not well formed. Must be: 'distro-version-arch.cfg'." >&2 @@ -311,9 +311,9 @@ 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 - TMP_REGEX_EXTRA="^[[:space:]]*\[[[:space:]]*${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}-extras-${DISTRO}[[:space:]]*\][[:space:]]*$" - TMP_REGEX_FULL="^[[:space:]]*\[[[:space:]]*${RPM_EXTRA_REPO_MOCK_CONFIG_BASE_NAME}-${COMPONENT}-${DISTRO}[[:space:]]*\][[:space:]]*$" - TMP_REGEX_OTHER="^[[:space:]]*\[.*\][[:space:]]*$" + 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_OTHER='^[[:space:]]*\[.*\][[:space:]]*$' while read line; do if [[ "${line}" =~ ${TMP_REGEX_EXTRA} ]]; then |