[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40601] [PATCH 22/28] Remove local bashisms
From: |
Vincent Legoll |
Subject: |
[bug#40601] [PATCH 22/28] Remove local bashisms |
Date: |
Sun, 17 May 2020 19:17:19 +0200 |
---
etc/guix-install.sh | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
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
--
2.26.2
- [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions., (continued)
- [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 19/28] Remove &> and >& bashisms, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 20/28] Add missing variable quoting & curly-bracketing for dl_path, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 21/28] Remove unused variable, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 24/28] Remove some "[[" bashisms, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 11/28] guix-install.sh: Use a variable for GPG key URL., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 23/28] Remove $UID bashism, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 09/28] guix-install.sh: Fix requirements., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 17/28] fix variable quoting in sys_make_guix_available, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 16/28] non-interactive mode, usage, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 22/28] Remove local bashisms,
Vincent Legoll <=
- [bug#40601] [PATCH 26/28] Add _debug_func() helper function, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 25/28] Remove unused variable set by "read", Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 27/28] Fix variable use in guix_get_bin_list(), Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 28/28] Remove "[[" bashisms in chk_init_sys(), Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section., Tobias Geerinckx-Rice, 2020/05/23