瀏覽代碼

Missing completion file

Bob Mottram 8 年之前
父節點
當前提交
a86bf87837
共有 2 個檔案被更改,包括 4 行新增3 行删除
  1. 1
    3
      src/freedombone-addcert
  2. 3
    0
      src/freedombone-encrypt-mail

+ 1
- 3
src/freedombone-addcert 查看文件

@@ -180,9 +180,7 @@ function add_cert_letsencrypt {
180 180
     # obtain the email address for the admin user
181 181
     if [ ! $MY_EMAIL_ADDRESS ]; then
182 182
         if [ -f $CONFIGURATION_FILE ]; then
183
-            if grep -q "MY_EMAIL_ADDRESS=" $CONFIGURATION_FILE; then
184
-                MY_EMAIL_ADDRESS=$(cat $CONFIGURATION_FILE | grep "MY_EMAIL_ADDRESS=" | awk -F '=' '{print $2}')
185
-            fi
183
+            read_config_param MY_EMAIL_ADDRESS
186 184
         fi
187 185
     fi
188 186
     if [ ! $MY_EMAIL_ADDRESS ]; then

+ 3
- 0
src/freedombone-encrypt-mail 查看文件

@@ -30,6 +30,9 @@
30 30
 
31 31
 USERNAME=$1
32 32
 
33
+PROJECT_NAME='freedombone'
34
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
35
+
33 36
 ADMIN_USER=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
34 37
 
35 38
 if [ ! $USERNAME ]; then