From 2d5656b4ca3384b0c4c72e18f6903be8b5212fdf Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Fri, 23 Jun 2017 17:40:53 +0200
Subject: [PATCH] ENH docker_wrap now supports multiple shells if available
---
bin/docker_wrap.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/bin/docker_wrap.sh b/bin/docker_wrap.sh
index 6c56cb3..534e577 100755
--- a/bin/docker_wrap.sh
+++ b/bin/docker_wrap.sh
@@ -18,6 +18,14 @@ setup_user() {
NEWUID="$(stat -c '%u' "$TARGET")"
NEWGID="$(stat -c '%g' "$TARGET")"
+ if [ -f "/bin/zsh" ]; then
+ USE_SHELL="/bin/zsh"
+ elif [ -f "/bin/bash" ]; then
+ USE_SHELL="/bin/bash"
+ else
+ USE_SHELL="/bin/sh"
+ fi
+
echo ">>> checking for group $NEWGID"
if ! getent group "$NEWGID" >/dev/null 2>/dev/null ; then
busybox addgroup -g "$NEWGID" "$NEWUSER" || (echo "!!! Couldn't create group with id $NEWGID" && exit 1)
@@ -28,7 +36,7 @@ setup_user() {
fi
echo ">>> checking for user $NEWUID"
if ! getent passwd "$NEWUID" >/dev/null 2>/dev/null ; then
- busybox adduser -G "$NEWGROUP" -u "$NEWUID" -h "$TARGET" -s /bin/sh -D "$NEWUSER" || (echo "!!! Couldn't create user" && exit 1)
+ busybox adduser -G "$NEWGROUP" -u "$NEWUID" -h "$TARGET" -s "$USE_SHELL" -D "$NEWUSER" || (echo "!!! Couldn't create user" && exit 1)
echo ">>> created user $NEWUSER($NEWUID)"
else
NEWUSER="$(getent passwd "$NEWUID" | cut -d: -f1)"
--
GitLab