Z99-cloud-locale-test.sh: install and make consistent.

Modify upstream packaging to install this file, which was
already installed in ubuntu packaging.

Also, white space changes from tabs to spaces.  Very few things
in cloud-init are tabs now.

Lastly, remove the executable bit on this as ait is not necessary.
Scripts in /etc/profile.d do not have executable bit.

2 files changed, 75 insertions, 74 deletions

diff --git a/packages/debian/rules.in b/packages/debian/rules.in
index 9b004357..3df6053a 100755
--- a/packages/debian/rules.in
+++ b/packages/debian/rules.in
@@ -11,6 +11,7 @@ override_dh_install:
 	dh_install
 	install -d debian/cloud-init/etc/rsyslog.d
 	cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
+	install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh
index 5912bae2..4978d87e 100755..100644
--- a/tools/Z99-cloud-locale-test.sh
+++ b/tools/Z99-cloud-locale-test.sh
@@ -11,90 +11,90 @@
 #  of how to fix them.
 
 locale_warn() {
-	local bad_names="" bad_lcs="" key="" val="" var="" vars="" bad_kv=""
-	local w1 w2 w3 w4 remain
+    local bad_names="" bad_lcs="" key="" val="" var="" vars="" bad_kv=""
+    local w1 w2 w3 w4 remain
 
-	# if shell is zsh, act like sh only for this function (-L).
-	# The behavior change will not permenently affect user's shell.
-	[ "${ZSH_NAME+zsh}" = "zsh" ] && emulate -L sh
+    # if shell is zsh, act like sh only for this function (-L).
+    # The behavior change will not permenently affect user's shell.
+    [ "${ZSH_NAME+zsh}" = "zsh" ] && emulate -L sh
 
-	# locale is expected to output either:
-	# VARIABLE=
-	# VARIABLE="value"
-	# locale: Cannot set LC_SOMETHING to default locale
-	while read -r w1 w2 w3 w4 remain; do
-		case "$w1" in
-			locale:) bad_names="${bad_names} ${w4}";;
-			*)
-				key=${w1%%=*}
-				val=${w1#*=}
-				val=${val#\"}
-				val=${val%\"}
-				vars="${vars} $key=$val";;
-		esac
-	done
-	for bad in $bad_names; do
-		for var in ${vars}; do
-			[ "${bad}" = "${var%=*}" ] || continue
-			val=${var#*=}
-			[ "${bad_lcs#* ${val}}" = "${bad_lcs}" ] &&
-				bad_lcs="${bad_lcs} ${val}"
-			bad_kv="${bad_kv} $bad=$val"
-			break
-		done
-	done
-	bad_lcs=${bad_lcs# }
-	bad_kv=${bad_kv# }
-	[ -n "$bad_lcs" ] || return 0
+    # locale is expected to output either:
+    # VARIABLE=
+    # VARIABLE="value"
+    # locale: Cannot set LC_SOMETHING to default locale
+    while read -r w1 w2 w3 w4 remain; do
+        case "$w1" in
+            locale:) bad_names="${bad_names} ${w4}";;
+            *)
+                key=${w1%%=*}
+                val=${w1#*=}
+                val=${val#\"}
+                val=${val%\"}
+                vars="${vars} $key=$val";;
+        esac
+    done
+    for bad in $bad_names; do
+        for var in ${vars}; do
+            [ "${bad}" = "${var%=*}" ] || continue
+            val=${var#*=}
+            [ "${bad_lcs#* ${val}}" = "${bad_lcs}" ] &&
+                bad_lcs="${bad_lcs} ${val}"
+            bad_kv="${bad_kv} $bad=$val"
+            break
+        done
+    done
+    bad_lcs=${bad_lcs# }
+    bad_kv=${bad_kv# }
+    [ -n "$bad_lcs" ] || return 0
 
-	printf "_____________________________________________________________________\n"
-	printf "WARNING! Your environment specifies an invalid locale.\n"
-	printf " The unknown environment variables are:\n   %s\n" "$bad_kv"
-	printf " This can affect your user experience significantly, including the\n"
-	printf " ability to manage packages. You may install the locales by running:\n\n"
+    printf "_____________________________________________________________________\n"
+    printf "WARNING! Your environment specifies an invalid locale.\n"
+    printf " The unknown environment variables are:\n   %s\n" "$bad_kv"
+    printf " This can affect your user experience significantly, including the\n"
+    printf " ability to manage packages. You may install the locales by running:\n\n"
 
-	local bad invalid="" to_gen="" sfile="/usr/share/i18n/SUPPORTED"
-	local pkgs=""
-	if [ -e "$sfile" ]; then
-		for bad in ${bad_lcs}; do
-			grep -q -i "${bad}" "$sfile" &&
-				to_gen="${to_gen} ${bad}" ||
-				invalid="${invalid} ${bad}"
-		done
-	else
-		printf "  sudo apt-get install locales\n"
-		to_gen=$bad_lcs
-	fi
-	to_gen=${to_gen# }
+    local bad invalid="" to_gen="" sfile="/usr/share/i18n/SUPPORTED"
+    local pkgs=""
+    if [ -e "$sfile" ]; then
+        for bad in ${bad_lcs}; do
+            grep -q -i "${bad}" "$sfile" &&
+                to_gen="${to_gen} ${bad}" ||
+                invalid="${invalid} ${bad}"
+        done
+    else
+        printf "  sudo apt-get install locales\n"
+        to_gen=$bad_lcs
+    fi
+    to_gen=${to_gen# }
 
-	local pkgs=""
-	for bad in ${to_gen}; do
-		pkgs="${pkgs} language-pack-${bad%%_*}"
-	done
-	pkgs=${pkgs# }
+    local pkgs=""
+    for bad in ${to_gen}; do
+        pkgs="${pkgs} language-pack-${bad%%_*}"
+    done
+    pkgs=${pkgs# }
 
-	if [ -n "${pkgs}" ]; then
-		printf "   sudo apt-get install ${pkgs# }\n"
-		printf "     or\n"
-		printf "   sudo locale-gen ${to_gen# }\n"
-		printf "\n"
-	fi
-	for bad in ${invalid}; do
-		printf "WARNING: '${bad}' is an invalid locale\n"
-	done
+    if [ -n "${pkgs}" ]; then
+        printf "   sudo apt-get install ${pkgs# }\n"
+        printf "     or\n"
+        printf "   sudo locale-gen ${to_gen# }\n"
+        printf "\n"
+    fi
+    for bad in ${invalid}; do
+        printf "WARNING: '${bad}' is an invalid locale\n"
+    done
 
-	printf "To see all available language packs, run:\n"
-	printf "   apt-cache search \"^language-pack-[a-z][a-z]$\"\n"
-	printf "To disable this message for all users, run:\n"
-	printf "   sudo touch /var/lib/cloud/instance/locale-check.skip\n"
-	printf "_____________________________________________________________________\n\n"
+    printf "To see all available language packs, run:\n"
+    printf "   apt-cache search \"^language-pack-[a-z][a-z]$\"\n"
+    printf "To disable this message for all users, run:\n"
+    printf "   sudo touch /var/lib/cloud/instance/locale-check.skip\n"
+    printf "_____________________________________________________________________\n\n"
 
-	# only show the message once
-	: > ~/.cloud-locale-test.skip 2>/dev/null || :
+    # only show the message once
+    : > ~/.cloud-locale-test.skip 2>/dev/null || :
 }
 
 [ -f ~/.cloud-locale-test.skip -o -f /var/lib/cloud/instance/locale-check.skip ] ||
-	locale 2>&1 | locale_warn
+    locale 2>&1 | locale_warn
 
 unset locale_warn
-# vi: ts=4 noexpandtab
+# vi: ts=4 expandtab