dropbear: Add back scp

[termux-packages] / scripts / run-docker.sh

diff --git a/scripts/run-docker.sh b/scripts/run-docker.sh
index e0400e1..c0f833b 100755 (executable)
--- a/scripts/run-docker.sh
+++ b/scripts/run-docker.sh
@@ -2,12 +2,17 @@
 set -e -u
 
 HOME=/home/builder
-REPOROOT="$(dirname $(readlink -f $0))/../"
+if [ `uname` = Darwin ]; then
+       # Workaround for mac readlink not supporting -f.
+       REPOROOT=$PWD
+else
+       REPOROOT="$(dirname $(readlink -f $0))/../"
+fi
 
 IMAGE_NAME=termux/package-builder
 CONTAINER_NAME=termux-package-builder
 
-[ $(id -u) -eq 0 ] && USER=root || USER=builder
+USER=builder
 
 echo "Running container '$CONTAINER_NAME' from image '$IMAGE_NAME'..."
 
@@ -20,7 +25,7 @@ docker start $CONTAINER_NAME > /dev/null 2> /dev/null || {
               --volume $REPOROOT:$HOME/termux-packages \
               --tty \
               $IMAGE_NAME
-       if [ $(id -u) -ne 1000 ]
+       if [ $(id -u) -ne 1000 -a $(id -u) -ne 0 ]
        then
                echo "Changed builder uid/gid... (this may take a while)"
                docker exec --tty $CONTAINER_NAME chown -R $(id -u) $HOME