From 449e1a5ff702f92c31daac5916bf5bb253d262a7 Mon Sep 17 00:00:00 2001
From: guest <ubuntu@ubu2.cherished.me>
Date: Sat, 8 Oct 2022 08:50:58 +0000
Subject: [PATCH] various'

---
 Taskfile.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index d5ca0ba..11d9891 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -10,14 +10,14 @@ tasks:
   install:
     desc: Install software
     cmds:
-      - mkdir ~/.local/bin
-      - mv go-task/task ~/.local/bin
-      - sudo mv go-task/task.bash /etc/bash_completion.d
-      - sudo rpm-ostree install fail2ban
-      - sudo cp zerotier/zerotier.repo /etc/yum/yum.repos.d
-      - sudo rpm-ostree install zerotier-one
+      - mkdir -p ~/.local/bin
+      - cp go-task/task ~/.local/bin
+      - sudo cp go-task/task.bash /etc/bash_completion.d
+      - [[ command -v fail2ban-client ]] || sudo rpm-ostree install fail2ban
+      - sudo cp zerotier/zerotier.repo /etc/yum.repos.d
+      - [[ command -v zerotier-cli ]] || sudo rpm-ostree install zerotier-one
       - sudo cp docker/docker-ce.repo /etc/yum.repos.d
-      - sudo rpm-ostree install docker-compose-plugin
+      - [[ command -v docker compose ]] || sudo rpm-ostree install docker-compose-plugin
 
   folders:
     desc: Make folders for server
@@ -26,7 +26,7 @@ tasks:
       - sudo chmod 700 /srv/{config,backup,gotask,rpdata,secret,srvtls,server}
       - sudo chown 1000 /srv/{config,backup,gotask,rpdata,secret,srvtls,server}
       - cp -r . /srv/server
-      - cd /srv/server
+      - rm -r .
 
   status:
     desc: Server Status
@@ -41,14 +41,14 @@ tasks:
       - sudo fail2ban-client get bad-auth banip --with-time
       - df
     preconditions:
-      - test 'command -v fail2ban-client'
+      - sh: 'command -v fail2ban-client'
 
   ztrs:
     cmds:
       - sudo zerotier-cli status
       - sudo zerotier-cli listnetworks
     preconditions:
-      - test 'command -v zerotier-cli'
+      - sh: 'command -v zerotier-cli'
 
   mailu:
     desc: Setup fail2ban for mailu frontend