Code refactoring

essentialkaos · Sep 9, 2024 · 9eea49c · 9eea49c
1 parent 78e4795
commit 9eea49c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SOURCES/libexec/package.shx b/SOURCES/libexec/package.shx
@@ -19,7 +19,7 @@ validatePackage() {
 
   if rpm -qp --scripts "$rpm_file" 2>&1 | grep -E -q '\%\{.*\}' ; then
     show "ERROR\n" $RED
-    show "RPM package ${CL_BL_RED}${rpm_name}${CL_RED} contains unexpanded macros in scriptlets:" $RED
+    show "RPM package \"$rpm_name\" contains unexpanded macros in scriptlets:" $RED
     show "${CL_GREY}"
     rpm -qp --scripts "$rpm_file" 2>&1 | grep -E -A1 -B1 '\%\{.*\}' | sed '/^$/d' | sed 's/^/  /g'
     show "${CL_NORM}"
@@ -29,7 +29,7 @@ validatePackage() {
 
   if rpm -qlp "$rpm_file" 2>&1 | grep -E -q '\%\{.*\}' ; then
     show "ERROR\n" $RED
-    show "RPM package ${CL_BL_RED}${rpm_name}${CL_RED} contains unexpanded macros in files section:" $RED
+    show "RPM package \"$rpm_name\" contains unexpanded macros in files section:" $RED
     show "${CL_GREY}"
     rpm -qlp "$rpm_file" 2>&1 | grep -E -A1 -B1 '\%\{.*\}' | sed '/^$/d' | sed 's/^/  /g'
     show "${CL_NORM}"

diff --git a/SOURCES/libexec/sources-scm.shx b/SOURCES/libexec/sources-scm.shx
@@ -614,7 +614,7 @@ packSourcesFromSvn() {
 
       if [[ -n "$path" ]] ; then
         if [[ ! -d "${source_name}_tmp/$path" ]] ; then
-          error "Can't find path ${CL_BL_RED}${path}${CL_NORM} in svn repository"
+          error "Can't find path \"$path\" in svn repository"
           doExit $ERROR_SOURCE
         else
           mv "${source_name}_tmp/$path" "$source_name"