From 2c5ddd12800e918eac49d27e25799de0e9e2bd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Fri, 26 Apr 2024 06:34:52 +0300 Subject: [PATCH] Source Update --- src/base.sh | 34 +++++++++++++-------------- src/commands/auth/login.sh | 2 +- src/commands/auth/logout.sh | 2 +- src/commands/settings.sh | 2 +- src/commands/ssh.sh | 2 +- src/commands/ssh/config.sh | 2 +- src/commands/ssh/sign.sh | 2 +- wx | 46 ++++++++++++++++++------------------- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/base.sh b/src/base.sh index 9ca7593..98662f1 100644 --- a/src/base.sh +++ b/src/base.sh @@ -18,28 +18,28 @@ echo -n " } start() { - syntax-line-douple - echo -n "Warén CLI " - syntax-line-douple + syntax-line-douple + echo -n "Warén CLI " + syntax-line-douple } stop () { - if [[ -d "./src" ]] - then - 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 &> /dev/null - chmod +x wx &> /dev/null - else - sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null - if [[ -d "/usr/bin" ]] + if [[ -d "./src" ]] then - sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null + 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 &> /dev/null + chmod +x wx &> /dev/null + else + sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null + if [[ -d "/usr/bin" ]] + then + sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null + fi + sudo chmod +x /usr/bin/wx &> /dev/null fi - sudo chmod +x /usr/bin/wx &> /dev/null - fi - echo " " - echo " " - exit 1 + echo " " + echo " " + exit 1 } {{ COMMANDS }} diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh index 2571d85..12e8195 100644 --- a/src/commands/auth/login.sh +++ b/src/commands/auth/login.sh @@ -1,3 +1,3 @@ warencli-login() { -echo ">>> Authentication: Login"; + echo ">>> Login <<<"; } diff --git a/src/commands/auth/logout.sh b/src/commands/auth/logout.sh index 848cdc2..1fe7fe5 100644 --- a/src/commands/auth/logout.sh +++ b/src/commands/auth/logout.sh @@ -1,3 +1,3 @@ warencli-logout() { -echo ">>> Authentication: Logout"; + echo ">>> Logout <<<"; } diff --git a/src/commands/settings.sh b/src/commands/settings.sh index 868a205..ae081fa 100644 --- a/src/commands/settings.sh +++ b/src/commands/settings.sh @@ -1,3 +1,3 @@ warencli-settings() { -echo ">>> Settings"; + echo ">>> Settings <<<"; } diff --git a/src/commands/ssh.sh b/src/commands/ssh.sh index 54509d6..15f430f 100644 --- a/src/commands/ssh.sh +++ b/src/commands/ssh.sh @@ -1,3 +1,3 @@ warencli-ssh() { -echo ">>> SSH"; + echo ">>> SSH <<<"; } diff --git a/src/commands/ssh/config.sh b/src/commands/ssh/config.sh index 928ca8d..687b5c9 100644 --- a/src/commands/ssh/config.sh +++ b/src/commands/ssh/config.sh @@ -1,3 +1,3 @@ warencli-ssh-config(){ -echo ">>> SSH: Config" + echo ">>> SSH: Config <<<" } diff --git a/src/commands/ssh/sign.sh b/src/commands/ssh/sign.sh index 5ffc5f2..2892c01 100644 --- a/src/commands/ssh/sign.sh +++ b/src/commands/ssh/sign.sh @@ -1,3 +1,3 @@ warencli-ssh-sign(){ -echo ">>> SSH: Certificates" + echo ">>> SSH: Certificates <<<" } diff --git a/wx b/wx index 684b1af..4830b4b 100755 --- a/wx +++ b/wx @@ -18,28 +18,28 @@ echo -n " } start() { - syntax-line-douple - echo -n "Warén CLI " - syntax-line-douple + syntax-line-douple + echo -n "Warén CLI " + syntax-line-douple } stop () { - if [[ -d "./src" ]] - then - 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 &> /dev/null - chmod +x wx &> /dev/null - else - sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null - if [[ -d "/usr/bin" ]] + if [[ -d "./src" ]] then - sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null + 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 &> /dev/null + chmod +x wx &> /dev/null + else + sudo curl https://git.waren.io/warengroup/wx/raw/branch/master/wx -o /opt/wx &> /dev/null + if [[ -d "/usr/bin" ]] + then + sudo ln -sf /opt/wx /usr/bin/wx &> /dev/null + fi + sudo chmod +x /usr/bin/wx &> /dev/null fi - sudo chmod +x /usr/bin/wx &> /dev/null - fi - echo " " - echo " " - exit 1 + echo " " + echo " " + exit 1 } warencli-help() { @@ -61,27 +61,27 @@ Management Commands: } warencli-settings() { -echo ">>> Settings"; + echo ">>> Settings <<<"; } warencli-ssh() { -echo ">>> SSH"; + echo ">>> SSH <<<"; } warencli-login() { -echo ">>> Authentication: Login"; + echo ">>> Login <<<"; } warencli-logout() { -echo ">>> Authentication: Logout"; + echo ">>> Logout <<<"; } warencli-ssh-config(){ -echo ">>> SSH: Config" + echo ">>> SSH: Config <<<" } warencli-ssh-sign(){ -echo ">>> SSH: Certificates" + echo ">>> SSH: Certificates <<<" }