diff --git a/scripts/install b/scripts/install index f15501a..0177888 100755 --- a/scripts/install +++ b/scripts/install @@ -113,10 +113,14 @@ sudo mv "$final_path/regex.py" /opt/yunohost/$app/lib/python*/site-packages/radi sudo rm /opt/yunohost/$app/lib/python*/site-packages/radicale/rights/regex.pyc if [ "$infcloud" = "1" ] then #Instal InfCloud + # Télécharge la source + wget -nv --show-progress -i ../sources/source_url -O infcloud.zip + # Vérifie la somme de contrôle de la source téléchargée. + md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" && false) # Décompresse la source - tar -x -f ../sources/infcloud.tar.gz + unzip -q infcloud.zip # Copie les fichiers sources - sudo cp -a infcloud "$final_path/" + sudo cp -a $(cat ../sources/source_dir)/. "$final_path" # Copie les fichiers additionnels ou modifiés. sudo cp -a ../sources/ajouts_infcloud/. "$final_path/infcloud/" fi diff --git a/scripts/upgrade b/scripts/upgrade index a903e02..be76822 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,10 +46,14 @@ sudo mv "$final_path/regex.py" /opt/yunohost/$app/lib/python*/site-packages/radi sudo rm /opt/yunohost/$app/lib/python*/site-packages/radicale/rights/regex.pyc if [ "$infcloud" = "1" ] then #Instal InfCloud + # Télécharge la source + wget -nv --show-progress -i ../sources/source_url -O infcloud.zip + # Vérifie la somme de contrôle de la source téléchargée. + md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" && false) # Décompresse la source - tar -x -f ../sources/infcloud.tar.gz + unzip -q infcloud.zip # Copie les fichiers sources - sudo cp -a infcloud "$final_path/" + sudo cp -a $(cat ../sources/source_dir)/. "$final_path" # Copie les fichiers additionnels ou modifiés. sudo cp -a ../sources/ajouts/. "$final_path/infcloud/" fi diff --git a/sources/infcloud.tar.gz b/sources/infcloud.tar.gz deleted file mode 100644 index c4b951f..0000000 Binary files a/sources/infcloud.tar.gz and /dev/null differ diff --git a/sources/source_dir b/sources/source_dir new file mode 100644 index 0000000..de0ff39 --- /dev/null +++ b/sources/source_dir @@ -0,0 +1 @@ +infcloud \ No newline at end of file diff --git a/sources/source_md5 b/sources/source_md5 new file mode 100644 index 0000000..908ca79 --- /dev/null +++ b/sources/source_md5 @@ -0,0 +1 @@ +6ffb1b3b9b7f54137723c6c13e9c5635 infcloud.zip \ No newline at end of file diff --git a/sources/source_url b/sources/source_url new file mode 100644 index 0000000..5f1271b --- /dev/null +++ b/sources/source_url @@ -0,0 +1 @@ +https://www.inf-it.com/InfCloud_0.13.1.zip \ No newline at end of file diff --git a/sources/version_0.13.1 b/sources/version_0.13.1 deleted file mode 100644 index 8d1c8b6..0000000 --- a/sources/version_0.13.1 +++ /dev/null @@ -1 +0,0 @@ -