Updated building/packaging scripts

yahoojapan · Mar 6, 2023 · f1126d0 · f1126d0
1 parent 7fa6703
commit f1126d0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 33 deletions.
diff --git a/.github/workflows/phpext_helper.sh b/.github/workflows/phpext_helper.sh
@@ -19,7 +19,7 @@
 #
 # AUTHOR:   Takeshi Nakatani
 # CREATE:   Fri, Feb 24 2022
-# REVISION:
+# REVISION: 1.1
 #
 
 #==============================================================
@@ -33,16 +33,18 @@ PIPEFAILURE_FILE="/tmp/.pipefailure.$(od -An -tu4 -N4 /dev/random | tr -d ' \n')
 #
 # For shellcheck
 #
-if locale -a | grep -q -i '^[[:space:]]*C.utf8[[:space:]]*$'; then
-	LANG=$(locale -a | grep -i '^[[:space:]]*C.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
-	LC_ALL="${LANG}"
-	export LANG
-	export LC_ALL
-elif locale -a | grep -q -i '^[[:space:]]*en_US.utf8[[:space:]]*$'; then
-	LANG=$(locale -a | grep -i '^[[:space:]]*en_US.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
-	LC_ALL="${LANG}"
-	export LANG
-	export LC_ALL
+if command -v locale >/dev/null 2>&1; then
+	if locale -a | grep -q -i '^[[:space:]]*C.utf8[[:space:]]*$'; then
+		LANG=$(locale -a | grep -i '^[[:space:]]*C.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
+		LC_ALL="${LANG}"
+		export LANG
+		export LC_ALL
+	elif locale -a | grep -q -i '^[[:space:]]*en_US.utf8[[:space:]]*$'; then
+		LANG=$(locale -a | grep -i '^[[:space:]]*en_US.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
+		LC_ALL="${LANG}"
+		export LANG
+		export LC_ALL
+	fi
 fi
 
 #==============================================================

diff --git a/buildutils/php_debian_build.sh b/buildutils/php_debian_build.sh
@@ -19,7 +19,7 @@
 #
 # AUTHOR:   Takeshi Nakatani
 # CREATE:   Tue, Feb 22 2022
-# REVISION:
+# REVISION: 1.1
 #
 
 #==============================================================
@@ -33,16 +33,18 @@ PIPEFAILURE_FILE="/tmp/.pipefailure.$(od -An -tu4 -N4 /dev/random | tr -d ' \n')
 #
 # For shellcheck
 #
-if locale -a | grep -q -i '^[[:space:]]*C.utf8[[:space:]]*$'; then
-	LANG=$(locale -a | grep -i '^[[:space:]]*C.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
-	LC_ALL="${LANG}"
-	export LANG
-	export LC_ALL
-elif locale -a | grep -q -i '^[[:space:]]*en_US.utf8[[:space:]]*$'; then
-	LANG=$(locale -a | grep -i '^[[:space:]]*en_US.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
-	LC_ALL="${LANG}"
-	export LANG
-	export LC_ALL
+if command -v locale >/dev/null 2>&1; then
+	if locale -a | grep -q -i '^[[:space:]]*C.utf8[[:space:]]*$'; then
+		LANG=$(locale -a | grep -i '^[[:space:]]*C.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
+		LC_ALL="${LANG}"
+		export LANG
+		export LC_ALL
+	elif locale -a | grep -q -i '^[[:space:]]*en_US.utf8[[:space:]]*$'; then
+		LANG=$(locale -a | grep -i '^[[:space:]]*en_US.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
+		LC_ALL="${LANG}"
+		export LANG
+		export LC_ALL
+	fi
 fi
 
 #----------------------------------------------------------

diff --git a/buildutils/php_rpm_build.sh b/buildutils/php_rpm_build.sh
@@ -19,7 +19,7 @@
 #
 # AUTHOR:   Takeshi Nakatani
 # CREATE:   Fri, Feb 18 2022
-# REVISION:
+# REVISION: 1.1
 #
 
 #==============================================================
@@ -33,16 +33,18 @@
 #
 # For shellcheck
 #
-if locale -a | grep -q -i '^[[:space:]]*C.utf8[[:space:]]*$'; then
-	LANG=$(locale -a | grep -i '^[[:space:]]*C.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
-	LC_ALL="${LANG}"
-	export LANG
-	export LC_ALL
-elif locale -a | grep -q -i '^[[:space:]]*en_US.utf8[[:space:]]*$'; then
-	LANG=$(locale -a | grep -i '^[[:space:]]*en_US.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
-	LC_ALL="${LANG}"
-	export LANG
-	export LC_ALL
+if command -v locale >/dev/null 2>&1; then
+	if locale -a | grep -q -i '^[[:space:]]*C.utf8[[:space:]]*$'; then
+		LANG=$(locale -a | grep -i '^[[:space:]]*C.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
+		LC_ALL="${LANG}"
+		export LANG
+		export LC_ALL
+	elif locale -a | grep -q -i '^[[:space:]]*en_US.utf8[[:space:]]*$'; then
+		LANG=$(locale -a | grep -i '^[[:space:]]*en_US.utf8[[:space:]]*$' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' | tr -d '\n')
+		LC_ALL="${LANG}"
+		export LANG
+		export LC_ALL
+	fi
 fi
 
 #----------------------------------------------------------