* Replace multiple / in container name, not just the first one

  This makes quay.io containers work
* Check for buildroot environment and adjust find appropriately

Author: pvanheus

docker2singularity.sh

@@ -45,7 +45,7 @@ image_name=`docker inspect --format="{{.Config.Image}}" $container_id`
 
 # using bash substitution
 # removing special chars [perhaps echo + sed would be better for other chars]
-image_name=${image_name/\//_}
+image_name=${image_name//\//_}
 image_name=${image_name/:/_}
 
 # following is the date of the container, not the docker image.
@@ -146,7 +146,14 @@ singularity exec --writable --contain $new_container_name /bin/sh -c "mkdir -p m
 # 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 / -executable -perm -u+x,o-x -not -path '/dev*' -not -path '/proc*' -not -path '/sys*' -exec chmod a+x '{}' \;"
+grep -q Buildroot /etc/issue
+if [[ $? -eq 0 ]] ; 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 
+    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