Kaynağa Gözat

Missing completion file

Bob Mottram 8 yıl önce
ebeveyn
işleme
a86bf87837
2 değiştirilmiş dosya ile 4 ekleme ve 3 silme
  1. 1
    3
      src/freedombone-addcert
  2. 3
    0
      src/freedombone-encrypt-mail

+ 1
- 3
src/freedombone-addcert Dosyayı Görüntüle

180
     # obtain the email address for the admin user
180
     # obtain the email address for the admin user
181
     if [ ! $MY_EMAIL_ADDRESS ]; then
181
     if [ ! $MY_EMAIL_ADDRESS ]; then
182
         if [ -f $CONFIGURATION_FILE ]; then
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
         fi
184
         fi
187
     fi
185
     fi
188
     if [ ! $MY_EMAIL_ADDRESS ]; then
186
     if [ ! $MY_EMAIL_ADDRESS ]; then

+ 3
- 0
src/freedombone-encrypt-mail Dosyayı Görüntüle

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