[X2Go-Commits] [buildscripts] 03/07: bin/build-rpm-package: use single quotes where more appropriate for regex variables, escape single dollar sign in double quoted regex variable strings.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit a4926c29ecd09ab655a2dff35af057334ad67d81
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 1 08:14:17 2015 +0200

    bin/build-rpm-package: use single quotes where more appropriate for regex variables, escape single dollar sign in double quoted regex variable strings.
---
 bin/build-rpm-package |    8 ++++----
 1 file 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

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git