Fix arg quoting

Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine
 MAINTAINER ViViDboarder <ViViDboarder@gmail.com>
 
-RUN apk -Uuv add curl ca-certificates
+RUN apk -Uuv add bash curl ca-certificates
 COPY push.sh /bin/
 RUN chmod +x /bin/push.sh
 

Makefile

@@ -6,6 +6,8 @@ default: test
 .PHONY: test
 test:
 	docker-compose -f ./tests/docker-compose-private.yml up \
+		--build --force-recreate \
 		--abort-on-container-exit --exit-code-from plugin
 	docker-compose -f ./tests/docker-compose-public.yml up \
+		--build --force-recreate \
 		--abort-on-container-exit --exit-code-from plugin

push.sh

@@ -1,62 +1,56 @@
-#! /bin/sh
+#! /bin/bash
+set -e
+
+ARGS=()
 
 # Use WEBDAV_USERNAME as default, if provided.
 if [ -z "$PLUGIN_USERNAME" ] && [ -n "$WEBDAV_USERNAME" ]; then
-
+  PLUGIN_USERNAME="$WEBDAV_USERNAME"
-    PLUGIN_USERNAME="$WEBDAV_USERNAME"
 fi
 
 # Use WEBDAV_PASSWORD as default, if provided.
 if [ -z "$PLUGIN_PASSWORD" ] && [ -n "$WEBDAV_PASSWORD" ]; then
-
+  PLUGIN_PASSWORD="$WEBDAV_PASSWORD"
-    PLUGIN_PASSWORD="$WEBDAV_PASSWORD"
 fi
 
 # If username and password are provided, add auth
 if [ -n "$PLUGIN_USERNAME" ] && [ -n "$PLUGIN_PASSWORD" ]; then
-
+  ARGS+=(--user "${PLUGIN_USERNAME}:${PLUGIN_PASSWORD}")
-    AUTH="--user '${PLUGIN_USERNAME}:${PLUGIN_PASSWORD}'"
 fi
 
 # Use a proxy, if one is specified
 if [ -n "$PLUGIN_PROXY_URL" ]; then
-
+  ARGS+=(--proxy "${PLUGIN_PROXY_URL}")
-    PLUGIN_PROXY_URL="--proxy '${PLUGIN_PROXY_URL}'"
 fi
 
 # If a timeout is specified, make use of it.
 if [ -n "$PLUGIN_TIMEOUT" ]; then
-
+  ARGS+=(--max-time "${PLUGIN_TIMEOUT}")
-    PLUGIN_TIMEOUT="--max-time '${PLUGIN_TIMEOUT}'"
 fi
 
 # Set PLUGIN_ATTEMPTS to one if nothing else is specified
 if [ -z "$PLUGIN_ATTEMPTS" ]; then
-
+  PLUGIN_ATTEMPTS=1
-    PLUGIN_ATTEMPTS=1
 fi
 
 # Repeat the upload as long as specified.
 while [ "${PLUGIN_ATTEMPTS}" -gt 0 ]; do
 
     # Uploading the file
-    curl $PLUGIN_PROXY_URL $PLUGIN_TIMEOUT $PLUGIN_CUSTOM_ARGUMENTS --upload-file $PLUGIN_FILE $AUTH $PLUGIN_DESTINATION && {
+    curl "${ARGS[@]}" --upload-file "$PLUGIN_FILE" "$PLUGIN_DESTINATION" && {
-
         # Terminate the script as soon as the upload is successful
-        echo "[INFO] Upload was successful."
+    echo "[INFO] Upload was successful."
-        exit 0
+    exit 0
 
-    }
+  }
 
     # Show messages in case uploads have failed
     [ "$PLUGIN_ATTEMPTS" -gt 1 ] && {
-
+      echo "[INFO] Upload failed. Attempting a new upload, if possible."
-        echo "[INFO] Upload failed. Attempting a new upload, if possible."
-
     }
 
-    sleep 5
+  sleep 5
-    PLUGIN_ATTEMPTS=$((PLUGIN_ATTEMPTS-1))
+  PLUGIN_ATTEMPTS=$((PLUGIN_ATTEMPTS-1))
 
 done
 

tests/docker-compose-private.yml

@@ -18,4 +18,5 @@ services:
       PLUGIN_DESTINATION: 'http://webdav/'
       PLUGIN_USERNAME: jdoe
       PLUGIN_PASSWORD: hunter2
+      PLUGIN_TIMEOUT: 10
       PLUGIN_ATTEMPTS: 4

tests/docker-compose-public.yml

@@ -13,4 +13,5 @@ services:
     environment:
       PLUGIN_FILE: '/test.txt'
       PLUGIN_DESTINATION: 'http://webdav/'
+      PLUGIN_TIMEOUT: 10
       PLUGIN_ATTEMPTS: 4