Moved the definition of the colour for warning from signalhandler.sh …

…to colour-codes.sh where it actually belongs
adoptium · Feb 17, 2018 · 770394d · 770394d
1 parent 89eee43
commit 770394d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -301,6 +301,7 @@ makeACopyOfLibFreeFontForMacOSX() {
         if [ -f "${INVOKED_BY_FONT_MANAGER}" ]; then
             otool -L "${INVOKED_BY_FONT_MANAGER}"
         else
+            # shellcheck disable=SC2154
             echo "${warning}[Warning] ${INVOKED_BY_FONT_MANAGER} does not exists in the ${IMAGE_DIRECTORY} folder, please check if this is the right folder to refer to, this may cause runtime issues, please beware...${normal}"
         fi
 

diff --git a/sbin/colour-codes.sh b/sbin/colour-codes.sh
@@ -21,6 +21,8 @@ esc=$(echo -en "\033")
 # shellcheck disable=SC2034
 error="${esc}[0;31m"
 # shellcheck disable=SC2034
+warning="${esc}[0;33m"  #yellow
+# shellcheck disable=SC2034
 good="${esc}[0;32m"
 # shellcheck disable=SC2034
 info="${esc}[0;33m"

diff --git a/sbin/signalhandler.sh b/sbin/signalhandler.sh
@@ -16,7 +16,6 @@
 # For terminal colors
 esc=$(echo -en "\033")
 error="${esc}[0;31m"  #red
-warning="${esc}[0;33m"  #yellow
 normal=$(echo -en "${esc}[m\017")