diff mbox series

[bug#40601,22/28] Remove local bashisms

Message ID 20200517171725.732-22-vincent.legoll@gmail.com
State Under Review
Delegated to: Christopher Baines
Headers show
Series [bug#40601,01/28] nix/local.mk: Add missing comment to sysvinit section. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Vincent Legoll May 17, 2020, 5:17 p.m. UTC 
---
 etc/guix-install.sh | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)
diff mbox series

Patch

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 078081c08a..c7144288c9 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -89,7 +89,6 @@  _debug()
 chk_require()
 { # Check that every required command is available.
     declare -a warn
-    local c
 
     _debug "--- [ $FUNCNAME ] ---"
 
@@ -163,24 +162,22 @@  chk_init_sys()
 
 chk_sys_arch()
 { # Check for operating system and architecture type.
-    local os
-    local arch
 
     os="$(uname -s)"
     arch="$(uname -m)"
 
     case "$arch" in
         i386 | i486 | i686 | i786 | x86)
-            local arch=i686
+            arch=i686
             ;;
         x86_64 | x86-64 | x64 | amd64)
-            local arch=x86_64
+            arch=x86_64
             ;;
         aarch64)
-            local arch=aarch64
+            arch=aarch64
             ;;
         armv7l)
-            local arch=armhf
+            arch=armhf
             ;;
         *)
             _err "${ERR}Unsupported CPU type: ${arch}"
@@ -189,7 +186,7 @@  chk_sys_arch()
 
     case "$os" in
         Linux | linux)
-            local os=linux
+            os=linux
             ;;
         *)
             _err "${ERR}Your operation system (${os}) is not supported."
@@ -204,10 +201,7 @@  chk_sys_arch()
 
 guix_get_bin_list()
 { # Scan GNU archive and save list of binaries
-    local gnu_url="$1"
-    local -a bin_ver_ls
-    local latest_ver
-    local default_ver
+    gnu_url="$1"
 
     _debug "--- [ $FUNCNAME ] ---"
 
@@ -235,9 +229,9 @@  guix_get_bin_list()
 
 guix_get_bin()
 { # Download and verify binary package.
-    local url="$1"
-    local bin_ver="$2"
-    local dl_path="$3"
+    url="$1"
+    bin_ver="$2"
+    dl_path="$3"
 
     _debug "--- [ $FUNCNAME ] ---"
 
@@ -267,8 +261,8 @@  guix_get_bin()
 
 sys_create_store()
 { # Unpack and install /gnu/store and /var/guix
-    local pkg="$1"
-    local tmp_path="$2"
+    pkg="$1"
+    tmp_path="$2"
 
     _debug "--- [ $FUNCNAME ] ---"
 
@@ -426,10 +420,6 @@  sys_enable_guix_daemon()
 sys_make_guix_available()
 { # add guix into PATH
 
-    local info_path
-    local local_bin
-    local var_guix
-
     _debug "--- [ $FUNCNAME ] ---"
 
     info_path="/usr/local/share/info"
@@ -559,7 +549,6 @@  handle_args()
 
 main()
 {
-    local tmp_path
     handle_args "$@"
     [ "${_INTERACTIVE}" -eq 1 ] && welcome