diff --git a/src/base.sh b/src/base.sh index 1a3cfc0..9cc2ec3 100644 --- a/src/base.sh +++ b/src/base.sh @@ -24,6 +24,7 @@ warencli-syntax-line-douple } warencli-stop () { + echo " " echo " " exit 1 } @@ -31,7 +32,9 @@ warencli-stop () { warencli-update() { if [[ -d "./src" ]]; then echo ">>> Building... <<<" - podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php + podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php &> /dev/null + mv wx.tmp wx + chmod +x wx else echo ">>> Updating... <<<" sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null @@ -42,8 +45,6 @@ else fi } -{{ COMMANDS }} - COMMAND=$1 warencli-start diff --git a/wx b/wx index 3356e81..9cc2ec3 100755 --- a/wx +++ b/wx @@ -24,6 +24,7 @@ warencli-syntax-line-douple } warencli-stop () { + echo " " echo " " exit 1 } @@ -31,7 +32,9 @@ warencli-stop () { warencli-update() { if [[ -d "./src" ]]; then echo ">>> Building... <<<" - podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php + podman run -it --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp docker.io/library/php:8-cli php generator.php &> /dev/null + mv wx.tmp wx + chmod +x wx else echo ">>> Updating... <<<" sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null @@ -42,58 +45,6 @@ else fi } -warencli-help() { -echo " -Usage: $0 COMMAND [OPTIONS] - -Common Commands: - ssh SSH - config Config - sign Certificates - -Authentication Commands: - login Login - logout Logout - -Management Commands: - settings Settings - -Maintenance Commands: - install Install - update Update -"; -} - - -warencli-install() { -echo ">>> Install"; -} - -warencli-settings() { -echo ">>> Settings"; -} - -warencli-ssh() { -echo ">>> SSH"; -} - -warencli-login() { -echo ">>> Authentication: Login"; -} - -warencli-logout() { -echo ">>> Authentication: Logout"; -} - -warencli-ssh-config(){ -echo ">>> SSH: Config" -} - -warencli-ssh-sign(){ -echo ">>> SSH: Certificates" -} - - COMMAND=$1 warencli-start