Fix docker_shell script to automatically copy batteries if necessary

Author: arik-so

ci/Dockerfile

@@ -29,8 +29,8 @@ COPY src ./src
 COPY templates ./templates
 COPY __main__.py ./
 
-RUN rm -r ci/LDKSwift/Sources/LDKHeaders
-RUN rm -r ci/LDKSwift/Sources/LDKSwift
+RUN rm -rf ci/LDKSwift/Sources/LDKHeaders
+RUN rm -rf ci/LDKSwift/Sources/LDKSwift
 RUN chmod +x ci/run_tests.sh
 
 COPY bindings/batteries ci/LDKSwift/Sources/LDKSwift/batteries

ci/docker_shell.sh

@@ -1,15 +1,20 @@
 pushd ../
 PROJECT_DIRECTORY=`pwd`
 LDK_DIRECTORY=$1
+MOUNT_CI_FOLDER=$2
 LDK_SUBDIRECTORY="$LDK_DIRECTORY/lightning-c-bindings"
-# echo $LDK_SUBDIRECTORY
 
-[ "${LDK_DIRECTORY}" = "" ] && echo "Usage: ./docker_shell.sh /path/to/ldk-c-bindings" && exit 1;
+[[ "${LDK_DIRECTORY}" = "" || "${MOUNT_CI_FOLDER}" = "" ]] && echo "Usage: ./docker_shell.sh /path/to/ldk-c-bindings true/false" && exit 1;
 [ ! -d "${LDK_DIRECTORY}" ] && echo "Provided directory does not exist" && exit 1;
-# [ ! -d "${LDK_SUBDIRECTORY}" ] && echo "Provided directory does not contain lightning-c-bindings directory." && exit 1;
+[ ! -d "${LDK_SUBDIRECTORY}" ] && echo "Provided directory does not contain lightning-c-bindings directory." && exit 1;
 
-# use for direct ci folder access
-# note: batteries will be missing. In parent directory, run `cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift`
-# docker run --name "swift-generator-shell" -i -v $PROJECT_DIRECTORY/ci:/ci -v $LDK_DIRECTORY:/ldk-c-bindings --rm -t swift-generation-ci /bin/bash
-
-docker run --name "swift-generator-shell" -i -v $LDK_DIRECTORY:/ldk-c-bindings --rm -t swift-generation-ci /bin/bash
+if [[ "${MOUNT_CI_FOLDER}" = "true" ]]; then
+	# use for direct ci folder access
+	# note: batteries will be missing. In parent directory, run `cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift`
+	cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift
+	docker run --name "swift-generator-shell" -e MOUNTED_CI_FOLDER=true -i -v $PROJECT_DIRECTORY/ci:/ci -v $LDK_DIRECTORY:/ldk-c-bindings --rm -t swift-generation-ci /bin/bash
+elif [ "${MOUNT_CI_FOLDER}" = "false" ]; then
+	docker run --name "swift-generator-shell" -e MOUNTED_CI_FOLDER=false -i -v $LDK_DIRECTORY:/ldk-c-bindings --rm -t swift-generation-ci /bin/bash
+else
+	echo "Usage: ./docker_shell.sh /path/to/ldk-c-bindings true/false" && exit 1;
+fi

ci/run_tests.sh

@@ -1,9 +1,12 @@
 set -e
 set -x
 
-# find all directories and files within LDKSwift sources, exclude batteries. 
+# find all directories and files within LDKSwift sources, exclude batteries.
 # If at least one result (xargs -r), remove recursively (rm -r)
+
+# remove everything except the batteries folder from the sources
 find ./LDKSwift/Sources/LDKSwift/* -maxdepth 0 -not -name 'batteries' | xargs -r rm -r
+
 # rm -i -r ./LDKSwift/Sources/LDKSwift/^(batteries)*
 
 pushd ../