[lxc-devel] [PATCH 1/2] lxc-alpine: fixes for checkbashism

[Stéphane Graber]

On Wed, Feb 19, 2014 at 03:52:01PM +0100, Natanael Copa wrote:
> Fix the issues reported by checkbashisms and change back to #!/bin/sh
> 
> Signed-off-by: Natanael Copa <ncopa at alpinelinux.org>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  templates/lxc-alpine.in | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
> index 5c4c585..459428d 100644
> --- a/templates/lxc-alpine.in
> +++ b/templates/lxc-alpine.in
> @@ -1,9 +1,9 @@
> -#!/bin/bash
> +#!/bin/sh
>  
>  # Detect use under userns (unsupported)
>  for arg in "$@"; do
> -    [ "$arg" == "--" ] && break
> -    if [ "$arg" == "--mapped-uid" -o "$arg" == "--mapped-gid" ]; then
> +    [ "$arg" = "--" ] && break
> +    if [ "$arg" = "--mapped-uid" -o "$arg" = "--mapped-gid" ]; then
>          echo "This template can't be used for unprivileged containers." 1>&2
>          echo "You may want to try the \"download\" template instead." 1>&2
>          exit 1
> @@ -11,7 +11,8 @@ for arg in "$@"; do
>  done
>  
>  # Make sure the usual locations are in PATH
> -export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
> +PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
> +export PATH
>  
>  key_sha256sums="9c102bcc376af1498d549b77bdbfa815ae86faa1d2d82f040e616b18ef2df2d4  alpine-devel at lists.alpinelinux.org-4a6a0840.rsa.pub
>  2adcf7ce224f476330b5360ca5edb92fd0bf91c92d83292ed028d7c4e26333ab  alpine-devel at lists.alpinelinux.org-4d07755e.rsa.pub"
> @@ -79,7 +80,8 @@ get_static_apk () {
>      if [ "$auto_repo_dir" ]; then
>          mirror_list=$rootfs/usr/share/alpine-mirrors/MIRRORS.txt
>          mirror_count=$(wc -l $mirror_list | cut -d " " -f 1)
> -        repository=$(sed $(expr $RANDOM % $mirror_count + 1)\!d \
> +        random=$(hexdump -n 2 -e '/2 "%u"' /dev/urandom)
> +        repository=$(sed $(expr $random % $mirror_count + 1)\!d \
>              $mirror_list)$auto_repo_dir
>          echo "Selecting mirror $repository"
>      fi
> -- 
> 1.8.5.4
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140219/7d135ba7/attachment.pgp>