From bcf489efe92f7e28f3c2d187db9ae3cf47932748 Mon Sep 17 00:00:00 2001
From: Guillaume Damiens <guillaume.damiens@etu.utc.fr>
Date: Sun, 12 May 2019 18:05:10 +0200
Subject: [PATCH] suppresion de tableaux associatifs et adaptation pour
docker-compose
---
pica-wekan-scripts/ids_example.sh | 2 +-
pica-wekan-scripts/policy.sh | 23 +++++++++++------------
pica-wekan-scripts/run.sh | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/pica-wekan-scripts/ids_example.sh b/pica-wekan-scripts/ids_example.sh
index a6442775..5fa2ccab 100644
--- a/pica-wekan-scripts/ids_example.sh
+++ b/pica-wekan-scripts/ids_example.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
username="username"
password="password"
diff --git a/pica-wekan-scripts/policy.sh b/pica-wekan-scripts/policy.sh
index 774a7cef..52e48f13 100755
--- a/pica-wekan-scripts/policy.sh
+++ b/pica-wekan-scripts/policy.sh
@@ -1,15 +1,13 @@
-#!/bin/bash
+#!/bin/sh
-. ids.sh # contient $username et $password pour authentification
-
-boardsToDelete[init]=false
+. ./ids.sh # contient $username et $password pour authentification
# Paramètres
-boardExpirationDurationYears=0 # années
-boardExpirationDurationMonths=12 # mois
-boardExpirationDurationDays=0 # jours
-url=https://wekan.test.picasoft.net
+boardExpirationDurationYears=${boardExpirationDurationYears-0} # années
+boardExpirationDurationMonths=${boardExpirationDurationMonths-12} # mois
+boardExpirationDurationDays=${boardExpirationDurationDays-0} # jours
+url=${url-"https://wekan.test.picasoft.net"}
# Deadline = somme des durées du dessus
deadlineTimeStamp=$(date -d "-"$boardExpirationDurationYears"years-"$boardExpirationDurationMonths"months-"$boardExpirationDurationDays"days" +%s)
delete=false
@@ -17,6 +15,7 @@ while getopts "d" option
do
delete=true
done
+boardsToDelete=""
# Récupération du token de connexion
queryPica=$(curl -s $url/users/login -d 'username='"$username"'&password='"$password"'')
@@ -60,12 +59,12 @@ do
echo "Suppresion du board "$boardTitle" (_id "$userBoard", modifié le "$lastModificationDate")"
# Suppression du board si trop ancien
- curl -X DELETE https://wekan.test.picasoft.net/api/boards/$userBoard \
- -H 'Authorization: Bearer '"$token"''
- elif [ ${boardsToDelete[$userBoard]} = false ]
+ # curl -X DELETE https://wekan.test.picasoft.net/api/boards/$userBoard \
+ # -H 'Authorization: Bearer '"$token"''
+ elif [ $(echo $boardsToDelete | grep -c $userBoard) -eq 0 ]
then
- boardsToDelete[$userBoard]=true
echo "Board "$boardTitle" trop ancien (modifié le "$lastModificationDate")"
+ boardsToDelete=$boardsToDelete$userBoard
fi
fi
done
diff --git a/pica-wekan-scripts/run.sh b/pica-wekan-scripts/run.sh
index bed27861..64c53e15 100755
--- a/pica-wekan-scripts/run.sh
+++ b/pica-wekan-scripts/run.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-if [$DRYRUN -eq 0]
+if [ $DRYRUN -eq 0 ]
then
./policy.sh -d
else
--
GitLab