Merge pull request #11 from marcodallasanta/development

Fix #9

.github/workflows/main.yml

@@ -12,9 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - uses: underscore69/ssh-scp-deploy@main
+      - uses: marcodallasanta/ssh-scp-deploy@main
         with:
-          local: "./"
+          local: "CHANGELOG.md"
           remote: "~/"
           host: ${{secrets.HOST}}
           user: ${{secrets.USER}}

CHANGELOG.md

@@ -1,9 +1,34 @@
 # [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
+
+### Fixed
+- Dockerfile used to copy just entrypoint.sh.
+
+## [v1.0.1] - 2020-12-21
+
+### Fixed
+- Dockerfile used to copy just entrypoint.sh.
+
 ## [v1.0.0] - 2020-12-18
 
 ### Added
 - First definition of the action.
 
 
+[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

Dockerfile

@@ -7,7 +7,6 @@ RUN  apk update && \
   bash
 
 COPY LICENSE README.md /
+COPY entrypoint.sh with_key.sh with_pass.sh /
 
-COPY entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

LICENSE

@@ -1,7 +1,7 @@
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2020 Marco Dalla Santa and contributors
+Copyright (c) 2020 Marco Dalla Santa
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,17 +1,37 @@
+<p align="center">
+  <img src="resources/logo.png">
+</p>
+
+<p align="center">
+  <a href="https://docs.github.com/en/actions/creating-actions/about-actions#types-of-actions"><img alt="Action type" src="https://img.shields.io/badge/Docker%20action-262b31?logo=docker&logoColor=2496ed"></a>
+  <a href="LICENSE"><img alt="License" src="https://img.shields.io/github/license/marcodallasanta/ssh-scp-deploy"></a>
+  <a href="https://github.com/marcodallasanta/ssh-scp-deploy/actions?query=workflow%3ATest"><img alt="Pipeline status" src="https://github.com/marcodallasanta/ssh-scp-deploy/workflows/Test/badge.svg"></a>
+</p>
+
 # ssh-scp-deploy
 
-[![Action type](https://img.shields.io/badge/Docker%20action-262b31?logo=docker&logoColor=2496ed)](https://docs.github.com/en/actions/creating-actions/about-actions#types-of-actions)
-[![License](https://img.shields.io/github/license/underscore69/ssh-scp-deploy)](https://opensource.org/licenses/MIT)
-[![Pipeline status](https://img.shields.io/github/workflow/status/underscore69/ssh-scp-deploy/Test?label=test)](./)
+## ❔ Why should I use this action?
 
-This action provide an easy and higly customizable way to upload files via scp and execute a set of command via ssh before or/and after. 
+Because this action provide an easy and higly customizable way to upload files via scp and execute a set of command via ssh before or/and after.  
+I use this action to deploy my personal projects to remote server, restarting the needed services or to do a simple upload via scp.
 
-## Supported runners
+## 🏃 Supported runners
 [![Supported runner](https://img.shields.io/badge/Linux-262b31?style=for-the-badge&logo=linux&logoColor=fcc624)](https://docs.github.com/en/actions/creating-actions/about-actions#docker-container-actions)
 
-## Usage
+
+## 👤 Author
+
+**Marco Dalla Santa**
+
+* Twitter: [@marcodallasanta](https://twitter.com/marcodallasanta)
+* Github: [@marcodallasanta](https://github.com/marcodallasanta)
+* LinkedIn: [@marcodallasanta](https://linkedin.com/in/marcodallasanta)
+* StackOverflow: [@marcodallasanta](https://stackoverflow.com/story/marcodallasanta)
+
+
+## ⚙️ Usage
 ```yaml
-    - uses: underscore69/ssh-scp-deploy@v1.0.0
+    - uses: mdallasanta/ssh-scp-deploy@{version}
       with:
         local: './'                                                  # Local file path - REQUIRED false - DEFAULT ./
         remote: '~/'                                                 # Remote file path - REQUIRED false - DEFAULT ~/
@@ -26,5 +46,18 @@ This action provide an easy and higly customizable way to upload files via scp a
         scp_options: -v                                              # Flags to use during scp - REQUIRED false - DEFAULT ''
 ```
 
-## License
+## 🤝 Contributing
+
+Contributions, issues and feature requests are welcome!
+
+Feel free to check [issues page](https://github.com/mdallasanta/ssh-scp-deploy/issues).
+
+## 🙏 Thanks
+
+Thanks to [Raphaël Bussa](https://github.com/raphaelbussa) for help in testing.
+
+## 📝 License
+
+Copyright © 2020 [Marco Dalla Santa](https://github.com/marcoallasanta)
+
 The source code, scripts and documentation in this project are released under the [MIT License](LICENSE)

entrypoint.sh

@@ -1,15 +1,17 @@
 #!/bin/bash
-PASSWORD=${INPUT_PASSWORD}
-KEY=${INPUT_KEY}
-if [ -z "$PRE_UPLOAD" and "$PASSWORD"]; then
+
+PASSWORD=${INPUT_PASSWORD};
+KEY=${INPUT_KEY};
+
+if [ -z "$KEY" ] && [ -z "$PASSWORD" ]; then
     echo "🔑 Please provide at least a key or a password...";
     exit 0;
 fi
 
-if [[ ! -z "$KEY" ]]; then
+if [[ -n "$KEY" ]]; then
     echo "🔑 Using key file...";
-    . with_key.sh;
+    source /with_key.sh;
 else
     echo "🔑 Using password...";
-    . with_pass.sh;
+    source /with_pass.sh;
 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}