Merge pull request #19 from jdidion/patch-1

Extend fix for #10 to Alpine as well as Busybox

Author: chrisgorgo

docker2singularity.sh

@@ -174,7 +174,15 @@ fi
 # making sure that any user can read and execute everything in the container
 echo "(7/9) Fixing permissions..."
 singularity exec --writable --contain $new_container_name /bin/sh -c "find /* -maxdepth 0 -not -path '/dev*' -not -path '/proc*' -not -path '/sys*' -exec chmod a+r -R '{}' \;"
-singularity exec --writable --contain $new_container_name /bin/sh -c "find /* (-type f -or -type d) -perm -u+x,o-x -not -path '/dev*' -not -path '/proc*' -not -path '/sys*' -exec chmod a+x '{}' \;"
+buildname=$(head -n 1 /etc/issue)
+if [[ $buildname =~ Buildroot|Alpine ]] ; then
+    # we're running on a Builroot container and need to use Busybox's find
+    echo "We're running on BusyBox/Buildroot"
+    singularity exec --writable --contain $new_container_name /bin/sh -c "find / -type f -or -type d -perm -u+x,o-x -not -path '/dev*' -not -path '/proc*' -not -path '/sys*' -exec chmod a+x '{}' \;"
+else
+    echo "We're not running on BusyBox/Buildroot"
+    singularity exec --writable --contain $new_container_name /bin/sh -c "find / -executable -perm -u+x,o-x -not -path '/dev*' -not -path '/proc*' -not -path '/sys*' -exec chmod a+x '{}' \;"
+fi
 
 echo "(8/9) Stopping and removing the container..."
 docker stop $container_id