Merge pull request #11 from marcodallasanta/development

Fix #9

CHANGELOG.md

@@ -1,5 +1,14 @@
 # [Unreleased]
 
+## [v1.0.4] - 2021-02-10
+
+### Fixed
+- Issue #9 - Wrong if on password.
+
+## [v1.0.3] - 2021-02-08
+
+### Fixed
+- Hardcoded user "ubuntu" in scp.
 
 ## [v1.0.2] - 2020-12-21
 
@@ -18,5 +27,8 @@
 
 
 [unreleased]: https://github.com/marcodallasanta/ssh-scp-deploy/compare/main...development
+[v1.0.4]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.4
+[v1.0.3]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.3
+[v1.0.2]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.2
 [v1.0.1]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.1
 [v1.0.0]: https://github.com/underscore69/ssh-scp-deploy/tree/v1.0.0

entrypoint.sh

@@ -3,7 +3,7 @@
 PASSWORD=${INPUT_PASSWORD};
 KEY=${INPUT_KEY};
 
-if [ -z "$PRE_UPLOAD" ] && [ "$PASSWORD" ]; then
+if [ -z "$KEY" ] && [ -z "$PASSWORD" ]; then
     echo "🔑 Please provide at least a key or a password...";
     exit 0;
 fi

with_key.sh

@@ -11,7 +11,7 @@ if [ ! -z "$PRE_UPLOAD" ]; then
 fi
 
 echo "🚚 Uploading via scp..." &&
-scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ubuntu@${INPUT_HOST}:"${INPUT_REMOTE}" &&
+scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" &&
 echo "🙌 Uploaded via scp";
 
 POST_UPLOAD=${INPUT_POST_UPLOAD}

with_pass.sh

@@ -6,7 +6,7 @@ if [ ! -z "$PRE_UPLOAD" ]; then
 fi
 
 echo "🚚 Uploading via scp..." &&
-sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ubuntu@${INPUT_HOST}:"${INPUT_REMOTE}" &&
+sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" &&
 echo "🙌 Uploaded via scp";
 
 POST_UPLOAD=${INPUT_POST_UPLOAD}