From 6937ba844775a91be9bd8e853fe91add125d9b6e Mon Sep 17 00:00:00 2001
From: Dict Xiong <me@beardic.cn>
Date: Sun, 13 Nov 2022 01:10:55 +0800
Subject: [PATCH] dogo/doll

dogo supports zsh/bash/sh; doll is introduced to launch a new docker
container; update $SUDO in command.sh
---
 scripts/dogo    |  4 ++--
 scripts/doll    | 10 ++++++++++
 tools/common.sh |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100755 scripts/doll

diff --git a/scripts/dogo b/scripts/dogo
index 0da9957..9bf98b4 100755
--- a/scripts/dogo
+++ b/scripts/dogo
@@ -4,7 +4,7 @@ THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/../tools/common.sh"
 
 if [[ -z "$1" || "$1" =~ "-h|--help" ]]; then
-    fmt_info "usage: dogo <container>"
+    fmt_info "usage: $0 <container>"
 else
-    $SUDO docker exec -it $1 zsh
+    $SUDO docker exec -it $1 sh -c 'if [ -x "$(command -v zsh)" ]; then zsh; elif [ -x "$(command -v bash)" ]; then echo "-->bash"; bash; else echo "-->sh"; sh; fi'
 fi
diff --git a/scripts/doll b/scripts/doll
new file mode 100755
index 0000000..958a130
--- /dev/null
+++ b/scripts/doll
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
+source "$THIS_DIR/../tools/common.sh"
+
+if [[ -z "$1" || "$1" =~ "-h|--help" ]]; then
+    fmt_info "usage: $0 <image>"
+else
+    $SUDO docker run -itd $1 sh
+fi
diff --git a/tools/common.sh b/tools/common.sh
index 1019dcf..525d878 100755
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -4,7 +4,7 @@ THIS_DIR_COMMON_SH=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 export DOTFILES=$( cd "$THIS_DIR_COMMON_SH/.." && pwd )
 
 SUDO=''
-if (( $EUID != 0 )); then
+if [[ "$EUID" != "0" && -x $(command -v sudo) ]]; then
     SUDO='sudo'
 fi