From: Vincent Legoll <vincent.legoll@gmail.com>
To: 40601@debbugs.gnu.org
Cc: Vincent Legoll <vincent.legoll@gmail.com>
Subject: [bug#40601] [PATCH 22/28] Remove local bashisms
Date: Sun, 17 May 2020 19:17:19 +0200 [thread overview]
Message-ID: <20200517171725.732-22-vincent.legoll@gmail.com> (raw)
In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com>
---
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
next prev parent reply other threads:[~2020-05-17 17:20 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 16:04 [bug#40601] [PATCH 0/5] Handle runit-based foreign distributions Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 1/5] nix/local.mk: Add missing comment to sysvinit section Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 2/5] guix-install.sh: Add xz to requirements Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 3/5] guix-install.sh: Fix systemctl not found error message at probe Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 4/5] guix-install.sh: Handle local binary tarball file Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 5/5] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions Vincent Legoll
2020-04-23 11:55 ` [bug#40601] bug#39023: binary installation manual doesn't work on Alpine Linux Vincent Legoll
2020-05-17 17:15 ` [bug#40601] [RFC, PATCH 0/28] guix-install.sh: port to other distros & init systems Vincent Legoll
2020-05-17 19:26 ` Julien Lepiller
2020-05-17 19:37 ` Vincent Legoll
2020-05-17 17:16 ` [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section Vincent Legoll
2020-05-17 17:16 ` [bug#40601] [PATCH 02/28] guix-install.sh: Add xz to requirements Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 03/28] guix-install.sh: Fix systemctl not found error message at probe Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 04/28] guix-install.sh: Handle local binary tarball file Vincent Legoll
2020-05-23 13:42 ` Tobias Geerinckx-Rice via Guix-patches via
2020-05-23 21:37 ` Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 05/28] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 06/28] guix-install.sh: trivial whitespace fix Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 07/28] guix-install.sh: Move code in a new function Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 09/28] guix-install.sh: Fix requirements Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 10/28] guix-install.sh: Replace subshell-inducing command grouping Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 11/28] guix-install.sh: Use a variable for GPG key URL Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 12/28] guix-install.sh: Rework user & group handling, adding busybox support Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 13/28] guix-install.sh: Make grep & mktemp usage compatible with busybox Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 14/28] guix-install.sh: Make tar " Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 16/28] non-interactive mode, usage Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 17/28] fix variable quoting in sys_make_guix_available Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v" Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 19/28] Remove &> and >& bashisms Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 20/28] Add missing variable quoting & curly-bracketing for dl_path Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 21/28] Remove unused variable Vincent Legoll
2020-05-17 17:17 ` Vincent Legoll [this message]
2020-05-17 17:17 ` [bug#40601] [PATCH 23/28] Remove $UID bashism Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 24/28] Remove some "[[" bashisms Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 25/28] Remove unused variable set by "read" Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 26/28] Add _debug_func() helper function Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 27/28] Fix variable use in guix_get_bin_list() Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 28/28] Remove "[[" bashisms in chk_init_sys() Vincent Legoll
2020-05-23 12:36 ` [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section Tobias Geerinckx-Rice via Guix-patches via
2020-05-22 13:44 ` [bug#40601] [guix-daemon now working on parabola with openrc] jgart--- via Guix-patches via
2020-05-22 18:40 ` Leo Famulari
2020-05-31 20:41 ` [bug#40601] New reduced patchset, the easy bits first Vincent Legoll
2020-12-18 12:28 ` Christopher Baines
2020-12-18 19:35 ` Vincent Legoll
2020-12-20 17:30 ` Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 1/7] guix-install.sh: Remove "[[" bashisms in chk_init_sys() Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 2/7] guix-install.sh: Remove $UID bashism Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 3/7] guix-install.sh: Fix requirements Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 4/7] guix-install.sh: trivial whitespace fix Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 5/7] guix-install.sh: Add variable quoting in sys_make_guix_available Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 6/7] guix-install.sh: Fix variable uses in guix_get_bin_list() Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 7/7] guix-install.sh: Add missing variable quoting & curly-bracketing in guix_get_bin() Vincent Legoll
2020-12-18 11:37 ` Christopher Baines
2020-10-07 16:09 ` [bug#40601] [PATCH 0/5] Handle runit-based foreign distributions zimoun
2020-12-20 17:28 ` [bug#40601] [PATCH 1/5] guix-install.sh: Remove "[[" bashisms in chk_init_sys() Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 2/5] guix-install.sh: Remove $UID bashism Vincent Legoll
2020-12-23 12:17 ` Christopher Baines
2020-12-23 14:59 ` Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 3/5] guix-install.sh: Fix requirements Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 4/5] guix-install.sh: Fix detection of SysV init system Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 5/5] guix-install.sh: Check daemonize package presence for sysv-init Vincent Legoll
2021-09-02 17:51 ` [bug#40601] guix-daemon runit service on void jgart via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200517171725.732-22-vincent.legoll@gmail.com \
--to=vincent.legoll@gmail.com \
--cc=40601@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).