[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40601] [PATCH 14/28] guix-install.sh: Make tar usage compatible wit
From: |
Vincent Legoll |
Subject: |
[bug#40601] [PATCH 14/28] guix-install.sh: Make tar usage compatible with busybox. |
Date: |
Sun, 17 May 2020 19:17:11 +0200 |
The --warning option is not suported by busybox tar, but it does not emit
missing
timestamps warnings anyways.
* etc/guix-install.sh (sys_create_store): Add --warning tar option only when
supported.
---
etc/guix-install.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 770ecfaf3f..b5e8416610 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -274,10 +274,13 @@ sys_create_store()
_debug "--- [ $FUNCNAME ] ---"
- cd "$tmp_path"
- tar --warning=no-timestamp \
- --extract \
- --file "$pkg" &&
+ # Do not use the --warning option with busybox tar
+ TAROPTS=("-C" "${tmp_path}")
+ if tar c --warning=no-timestamp -f /dev/null /dev/null >&/dev/null; then
+ TAROPTS+=("--warning=no-timestamp")
+ fi
+
+ tar x -f "${pkg}" "${TAROPTS[@]}" &&
_msg "${PAS}unpacked archive"
if [[ -e "/var/guix" || -e "/gnu" ]]; then
--
2.26.2
- [bug#40601] [PATCH 04/28] guix-install.sh: Handle local binary tarball file., (continued)
- [bug#40601] [PATCH 02/28] guix-install.sh: Add xz to requirements., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 03/28] guix-install.sh: Fix systemctl not found error message at probe., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 06/28] guix-install.sh: trivial whitespace fix., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 05/28] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 10/28] guix-install.sh: Replace subshell-inducing command grouping., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 12/28] guix-install.sh: Rework user & group handling, adding busybox support., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 13/28] guix-install.sh: Make grep & mktemp usage compatible with busybox., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 14/28] guix-install.sh: Make tar usage compatible with busybox.,
Vincent Legoll <=
- [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v", Vincent Legoll, 2020/05/17
- [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