From b95e0830ec9127c8f8cba5f8420543ab4028dee7 Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Tue, 19 Mar 2024 11:03:18 +0000 Subject: [PATCH 1/9] Update Semaphore configuration --- .semaphore/semaphore.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .semaphore/semaphore.yml diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml new file mode 100644 index 0000000..e481b89 --- /dev/null +++ b/.semaphore/semaphore.yml @@ -0,0 +1,21 @@ +version: v1.0 +name: Initial Pipeline +agent: + machine: + type: e1-standard-2 + os_image: ubuntu2004 +blocks: + - name: 'Block #1' + task: + prologue: + commands: + - checkout + - bash install.bash + jobs: + - name: Install + commands: + - bash --rcfile "$HOME"/.bashrc -c "which bashfox" + - name: Uninstall + commands: + - bash uninstall.bash + - bash --rcfile "$HOME"/.bashrc -c "! which bashfox" From 05dc4c693ec10b5c7d65f3906b63b7465558c8de Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Tue, 19 Mar 2024 12:05:13 +0100 Subject: [PATCH 2/9] Update semaphore.yml From 762ce362acf86ccb885e5e98edaef61d2a91c1c1 Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Tue, 19 Mar 2024 11:06:34 +0000 Subject: [PATCH 3/9] Update Semaphore configuration --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index e481b89..308fcc1 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -7,9 +7,9 @@ agent: blocks: - name: 'Block #1' task: - prologue: + prologue: commands: - - checkout + - checkout - bash install.bash jobs: - name: Install From 3d3c30dc2b64158c3636122369e1997d1b828249 Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Tue, 19 Mar 2024 12:07:51 +0100 Subject: [PATCH 4/9] Update semaphore.yml From 3cdc9c499dd3cde6e7e337431037704bd702243e Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Tue, 19 Mar 2024 12:09:29 +0100 Subject: [PATCH 5/9] Update semaphore.yml --- .semaphore/semaphore.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 308fcc1..1117441 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -8,7 +8,7 @@ blocks: - name: 'Block #1' task: prologue: - commands: + commands: - checkout - bash install.bash jobs: @@ -16,6 +16,6 @@ blocks: commands: - bash --rcfile "$HOME"/.bashrc -c "which bashfox" - name: Uninstall - commands: - - bash uninstall.bash + commands: + - bash uninstall.bash - bash --rcfile "$HOME"/.bashrc -c "! which bashfox" From 9ec3628766cd6d9d86b016806afca3c182efcec3 Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Tue, 19 Mar 2024 12:10:43 +0100 Subject: [PATCH 6/9] Update semaphore.yml --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 1117441..6d41191 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -1,11 +1,11 @@ version: v1.0 -name: Initial Pipeline +name: test agent: machine: type: e1-standard-2 os_image: ubuntu2004 blocks: - - name: 'Block #1' + - name: 'Main' task: prologue: commands: From e635301f985179eb6f18e23db31ffb6a7c4a9690 Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Sat, 23 Mar 2024 09:38:10 +0000 Subject: [PATCH 7/9] Update Semaphore configuration --- .semaphore/semaphore.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 6d41191..9c7a00c 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -5,7 +5,7 @@ agent: type: e1-standard-2 os_image: ubuntu2004 blocks: - - name: 'Main' + - name: Main task: prologue: commands: @@ -14,8 +14,8 @@ blocks: jobs: - name: Install commands: - - bash --rcfile "$HOME"/.bashrc -c "which bashfox" + - bash --rcfile "$HOME"/.bashrc -ic "which bashfox" - name: Uninstall commands: - bash uninstall.bash - - bash --rcfile "$HOME"/.bashrc -c "! which bashfox" + - bash --rcfile "$HOME"/.bashrc -ic "! which bashfox" From bacc2517aaafb30469cbe6b61a87e9095ad59296 Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Sat, 23 Mar 2024 10:40:41 +0100 Subject: [PATCH 8/9] Update uninstall.bash --- uninstall.bash | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/uninstall.bash b/uninstall.bash index 87ff03c..1fbacec 100755 --- a/uninstall.bash +++ b/uninstall.bash @@ -1,10 +1,12 @@ #!/bin/bash echo "UNINSTALLING BASHFOX" -randstr="$(base64 /dev/urandom -w6 | grep -v '/' | head -n1)" -echo -echo "--- CHECK ---" -read -p "Enter $randstr to proceed: " check -[ "$check" = "$randstr" ] || ( echo "Abort" && exit ) +if [ ! "$UBFORCE" ]; then + randstr="$(base64 /dev/urandom -w6 | grep -v '/' | head -n1)" + echo + echo "--- CHECK ---" + read -p "Enter $randstr to proceed: " check + [ "$check" = "$randstr" ] || ( echo "Abort" && exit ) +fi echo echo "--- UNINSTALL ---" rm -vrf ~/.bashfox From 606034a1e35d8271d74494295219ed8b6e09d42b Mon Sep 17 00:00:00 2001 From: Roman Weiss Date: Sat, 23 Mar 2024 09:41:05 +0000 Subject: [PATCH 9/9] Update Semaphore configuration --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 9c7a00c..a3bf669 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -17,5 +17,5 @@ blocks: - bash --rcfile "$HOME"/.bashrc -ic "which bashfox" - name: Uninstall commands: - - bash uninstall.bash + - UBFORCE=1 bash uninstall.bash - bash --rcfile "$HOME"/.bashrc -ic "! which bashfox"