Browse Source

Mailpile upgrades

Bob Mottram 7 years ago
parent
commit
cddc4639f3
1 changed files with 16 additions and 4 deletions
  1. 16
    4
      src/freedombone-app-mailpile

+ 16
- 4
src/freedombone-app-mailpile View File

@@ -37,7 +37,7 @@ MAILPILE_DOMAIN_NAME=
37 37
 MAILPILE_CODE=
38 38
 MAILPILE_ONION_PORT=8103
39 39
 MAILPILE_REPO="https://github.com/mailpile/Mailpile"
40
-MAILPILE_COMMIT='cfd1749a2d073be2903ce947c7cbf59b1e237448'
40
+MAILPILE_COMMIT='6f56fe4ad736c8e385bea658454bed110d08c60d'
41 41
 MAILPILE_PORT=33411
42 42
 
43 43
 mailpile_variables=(MAILPILE_REPO
@@ -83,12 +83,24 @@ function reconfigure_mailpile {
83 83
 function upgrade_mailpile {
84 84
     read_config_param "MAILPILE_DOMAIN_NAME"
85 85
 
86
+    upgrade_mp=
87
+    CURR_COMMIT=$MAILPILE_COMMIT
88
+    if grep -q "mailpile commit" $COMPLETION_FILE; then
89
+        CURR_COMMIT=$(get_completion_param "mailpile commit")
90
+    fi
91
+    if [[ "$CURR_COMMIT" != "$MAILPILE_COMMIT" ]]; then
92
+        upgrade_mp=1
93
+    fi
94
+
86 95
     function_check set_repo_commit
87 96
     set_repo_commit /var/www/$MAILPILE_DOMAIN_NAME/mail "mailpile commit" "$MAILPILE_COMMIT" $MAILPILE_REPO
88
-    cd /var/www/$MAILPILE_DOMAIN_NAME/mail
89
-    pip install -r requirements.txt
90 97
 
91
-    chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail
98
+    if [ $upgrade_mp ]; then
99
+        cd /var/www/$MAILPILE_DOMAIN_NAME/mail
100
+        pip install -r requirements.txt
101
+
102
+        chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail
103
+    fi
92 104
 }
93 105
 
94 106
 function backup_local_mailpile {