diff mbox series

[bug#40601,2/5] guix-install.sh: Remove $UID bashism.

Message ID 20201220172839.3059-2-vincent.legoll@gmail.com
State New
Headers show
Series [bug#40601,1/5] guix-install.sh: Remove "[[" bashisms in chk_init_sys(). | expand

Checks

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

Commit Message

Vincent Legoll Dec. 20, 2020, 5:28 p.m. UTC
* etc/guix-install.sh: Use `id -u' instead of $UID.
---
 etc/guix-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christopher Baines Dec. 23, 2020, 12:17 p.m. UTC | #1
Vincent Legoll <vincent.legoll@gmail.com> writes:

> * etc/guix-install.sh: Use `id -u' instead of $UID.
> ---
>  etc/guix-install.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/etc/guix-install.sh b/etc/guix-install.sh
> index 26c8622855..0102901010 100755
> --- a/etc/guix-install.sh
> +++ b/etc/guix-install.sh
> @@ -32,7 +32,7 @@ fi
>  
>  set -e
>  
> -[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
> +[ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
>  
>  REQUIRE=(
>      "dirname"

Should id be added as a requirement?
Vincent Legoll Dec. 23, 2020, 2:59 p.m. UTC | #2
Hello,

On Wed, Dec 23, 2020 at 1:17 PM Christopher Baines <mail@cbaines.net> wrote:
> > -[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
> > +[ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
> >
> >  REQUIRE=(
> >      "dirname"
>
> Should id be added as a requirement?

good catch !

thanks, I'll respin after this round of feedback
diff mbox series

Patch

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 26c8622855..0102901010 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -32,7 +32,7 @@  fi
 
 set -e
 
-[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
+[ "$(id -u)" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
 
 REQUIRE=(
     "dirname"