1 files changed, 44 insertions, 40 deletions
diff --git a/libre/iceweasel-l10n/updatelanglist.sh b/libre/iceweasel-l10n/updatelanglist.sh
index 1d9ad9583..f744b6936 100755
--- a/libre/iceweasel-l10n/updatelanglist.sh
+++ b/libre/iceweasel-l10n/updatelanglist.sh
@@ -1,48 +1,20 @@
 #!/bin/bash
-# helper script to check the local language list against upstream
 
-export CARCH="${CARCH:-$(uname -m)}"
-
-# extract pkgbase from pkgbuild
-pkgbase="$(bash -c "source PKGBUILD && echo \"\$_pkgbase\"")"
+# helper script to check the local language list against mozilla
 
-echo "attempting update to language lists for $pkgbase"
-echo "  CARCH: $CARCH"
-
-# produce new language list
-url="$(bash -c "source PKGBUILD && echo \"\$_src_url\"")/"
-
-echo "_languages=(" > "languages.$CARCH.pkgnew"
-echo "_sha512sums=(" > "sha512sums.$CARCH.pkgnew"
-
-mkdir -p src
-
-for lang in $(curl -sL "$url" | grep '\.xpi' | cut -d'"' -f2 | rev | cut -d'/' -f1 | cut -d'.' -f2 | rev | sort); do
-  printf "\r  %-3s..." "${lang%%-*}"
-  curl -s -o src/"$lang.xpi" "${url%/}/$lang.xpi"
-  sha512sum="$(sha512sum "src/$lang.xpi" | cut -d' ' -f1)"
-  name="$(unzip -p "src/$lang.xpi" manifest.json | grep "  \"name" | cut -d':' -f2- | cut -d'"' -f2)"
 
-  printf "  '%-5s  \"%s\"'\n" "$lang" "$name" \
-      >> "languages.$CARCH.pkgnew"
-  printf "  '%s'\n" "$sha512sum" \
-      >> "sha512sums.$CARCH.pkgnew"
-done
-echo
+export CARCH="${CARCH:-$(uname -m)}"
 
-echo ")" >> "languages.$CARCH.pkgnew"
-echo ")" >> "sha512sums.$CARCH.pkgnew"
 
-admsq() {
+prompt() {
   if cmp "$1"{,.pkgnew} > /dev/null; then
     echo "$1 unchanged"
     rm -f "$1.pkgnew"
   else
     diff -rupN "$1"{,.pkgnew}
     while true; do
-      read -n1 -p "[a]pply, [d]elete, [m]erge, [s]kip, [q]uit " x
-      echo
-      case $x in
+      read -n1 -p "[a]pply, [d]elete, [m]erge, [s]kip, [q]uit " resp ; echo ;
+      case $resp in
         a) mv "$1"{.pkgnew,}
            break
            ;;
@@ -63,15 +35,47 @@ admsq() {
   fi
 }
 
-# compare and update
-admsq "languages.$CARCH"
-admsq "sha512sums.$CARCH"
 
-# update PKGBUILD checksums
-_languages_shasum="$(sha512sum "languages.$CARCH" | cut -d' ' -f1)"
+## extract metadata from PKGBUILD ##
+
+pkgbase="$(bash -c "source PKGBUILD && echo \"\$_pkgbase\"")"
+url="$(    bash -c "source PKGBUILD && echo \"\$_src_url\"")/"
+echo "attempting update to language lists for '$pkgbase'"
+echo -e "  CARCH: $CARCH\n  URL: $url"
+read -n1 -p "is this correct? [Yn] " resp ; echo ; [[ "$resp" =~ n|N ]] && exit ;
+
+
+## generate new language list ##
+
+mkdir -p src
+echo "_languages=("  > "languages.$CARCH.pkgnew"
+echo "_sha512sums=(" > "sha512sums.$CARCH.pkgnew"
+for lang in $(curl -sL "$url" | grep '\.xpi' | cut -d'"' -f2 | rev | cut -d'/' -f1 | cut -d'.' -f2 | rev | sort); do
+  printf "\r  %-3s..." "${lang%%-*}"
+  curl -s -o src/"$lang.xpi" "${url%/}/$lang.xpi"
+  sha512sum="$(sha512sum "src/$lang.xpi" | cut -d' ' -f1)"
+  name="$(unzip -p "src/$lang.xpi" manifest.json | grep "  \"name" | cut -d':' -f2- | cut -d'"' -f2)"
+
+  printf "  '%-5s  \"%s\"'\n" "$lang" "$name" >> "languages.$CARCH.pkgnew"
+  printf "  '%s'\n" "$sha512sum"              >> "sha512sums.$CARCH.pkgnew"
+done
+echo
+echo ")" >> "languages.$CARCH.pkgnew"
+echo ")" >> "sha512sums.$CARCH.pkgnew"
+
+
+## compare and update lang-pack/checksums lists ##
+
+prompt "languages.$CARCH"
+prompt "sha512sums.$CARCH"
+
+
+## update PKGBUILD checksums for lang-pack/checksums lists ##
+
+_languages_shasum="$( sha512sum "languages.$CARCH"  | cut -d' ' -f1)"
 _sha512sums_shasum="$(sha512sum "sha512sums.$CARCH" | cut -d' ' -f1)"
+
 sed -e "s/^_languages_${CARCH}_shasum=.*/_languages_${CARCH}_shasum=\"${_languages_shasum}\"/" \
     -e "s/^_sha512sums_${CARCH}_shasum=.*/_sha512sums_${CARCH}_shasum=\"${_sha512sums_shasum}\"/" \
   PKGBUILD > PKGBUILD.pkgnew
-
-admsq "PKGBUILD"
+prompt "PKGBUILD"