aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2019-06-28 00:51:34 +0200
committerGitHub <noreply@github.com>2019-06-28 00:51:34 +0200
commite0d8fa20c3694523b15e5602001a2727314698d9 (patch)
tree2625d66cd81c8183d2e0f55815f2edf9d726f9a6
parentbcd3b889af03be3499450fc1842fb5b18a4382ed (diff)
parent86543fc1f0e6b87cff1a39c9c24f2643ab8c702d (diff)
downloadmastodon_ynh-e0d8fa20c3694523b15e5602001a2727314698d9.tar.gz
mastodon_ynh-e0d8fa20c3694523b15e5602001a2727314698d9.tar.bz2
mastodon_ynh-e0d8fa20c3694523b15e5602001a2727314698d9.zip
Merge pull request #163 from YunoHost-Apps/fix_upgrade
Fix upgrade
-rw-r--r--scripts/upgrade6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/upgrade b/scripts/upgrade
index 3dafd21..46e7229 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -169,11 +169,11 @@ then
# Download Mastodon
mv "$final_path/live" "$final_path/live_back"
ynh_setup_source --dest_dir="$final_path/live"
- if [ -z $final_path/live_back/public/system ]; then
- rsync -a "$final_path/live_back/public/system" "$final_path/live_back/public/."
+ if [ -d "$final_path/live_back/public/system" ]; then
+ rsync -a "$final_path/live_back/public/system" "$final_path/live/public/."
fi
rsync -a "$final_path/live_back/.env.production" "$final_path/live/."
- rm -Rf "$final_path/live_back"
+ ynh_secure_remove --file="$final_path/live_back/"
# Clean files which are not needed anymore
ynh_secure_remove --file="$final_path/live/config/initializers/timeout.rb"