浏览代码

Don't mount if usb is already mounted

Bob Mottram 10 年前
父节点
当前提交
e94545a91a
共有 1 个文件被更改,包括 56 次插入54 次删除
  1. 56
    54
      install-freedombone.sh

+ 56
- 54
install-freedombone.sh 查看文件

@@ -150,53 +150,55 @@ function search_for_attached_usb_drive {
150 150
       return
151 151
   fi
152 152
   if [ -d $USB_DRIVE ]; then
153
-	  mount $USB_DRIVE /media/usb
154
-	  if [ -d /media/usb/Maildir ]; then
155
-		  echo 'Maildir found on USB drive'
156
-		  IMPORT_MAILDIR=/media/usb/Maildir
157
-	  fi
158
-	  if [ -d /media/usb/.gnupg ]; then
159
-		  echo 'Importing GPG keyring'
160
-		  cp -r /media/usb/.gnupg /home/$MY_USERNAME/.gnupg
161
-		  chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
162
-		  shred -zu /media/usb/.gnupg/secring.gpg
163
-		  shred -zu /media/usb/.gnupg/random_seed
164
-		  shred -zu /media/usb/.gnupg/trustdb.gpg
165
-		  rm -rf /media/usb/.gnupg
166
-	  fi
167
-	  if [ -f /media/usb/private_key.gpg ]; then
168
-		  echo 'GPG private key found on USB drive'
169
-		  MY_GPG_PRIVATE_KEY=/media/usb/private_key.gpg
170
-	  fi
171
-	  if [ -f /media/usb/public_key.gpg ]; then
172
-		  echo 'GPG public key found on USB drive'
173
-		  MY_GPG_PUBLIC_KEY=/media/usb/public_key.gpg
174
-	  fi
175
-	  if [ -d /media/usb/.ssh ]; then
176
-		  echo 'Importing ssh keys'
177
-		  cp -r /media/usb/.ssh /home/$MY_USERNAME/.ssh
178
-		  chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
179
-		  # for security delete the ssh keys from the usb drive
180
-		  shred -zu /media/usb/.ssh/id_rsa
181
-		  shred -zu /media/usb/.ssh/id_rsa.pub
182
-		  shred -zu /media/usb/.ssh/known_hosts
183
-		  rm -rf /media/usb/.ssh
184
-	  fi
185
-	  if [ -f /media/usb/.emacs ]; then
186
-		  echo 'Importing .emacs file'
187
-		  cp -f /media/usb/.emacs /home/$MY_USERNAME/.emacs
188
-		  chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs
189
-	  fi
190
-	  if [ -d /media/usb/.emacs.d ]; then
191
-		  echo 'Importing .emacs.d directory'
192
-		  cp -r /media/usb/.emacs.d /home/$MY_USERNAME/.emacs.d
193
-		  chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs.d
194
-	  fi
195
-	  if [ -d /media/usb/personal ]; then
196
-		  echo 'Importing personal directory'
197
-		  cp -r /media/usb/personal /home/$MY_USERNAME/personal
198
-		  chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
199
-	  fi
153
+      if [ ! -d /media/usb ]; then
154
+          mount $USB_DRIVE /media/usb
155
+      fi
156
+      if [ -d /media/usb/Maildir ]; then
157
+          echo 'Maildir found on USB drive'
158
+          IMPORT_MAILDIR=/media/usb/Maildir
159
+      fi
160
+      if [ -d /media/usb/.gnupg ]; then
161
+          echo 'Importing GPG keyring'
162
+          cp -r /media/usb/.gnupg /home/$MY_USERNAME/.gnupg
163
+          chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
164
+          shred -zu /media/usb/.gnupg/secring.gpg
165
+          shred -zu /media/usb/.gnupg/random_seed
166
+          shred -zu /media/usb/.gnupg/trustdb.gpg
167
+          rm -rf /media/usb/.gnupg
168
+      fi
169
+      if [ -f /media/usb/private_key.gpg ]; then
170
+          echo 'GPG private key found on USB drive'
171
+          MY_GPG_PRIVATE_KEY=/media/usb/private_key.gpg
172
+      fi
173
+      if [ -f /media/usb/public_key.gpg ]; then
174
+          echo 'GPG public key found on USB drive'
175
+          MY_GPG_PUBLIC_KEY=/media/usb/public_key.gpg
176
+      fi
177
+      if [ -d /media/usb/.ssh ]; then
178
+          echo 'Importing ssh keys'
179
+          cp -r /media/usb/.ssh /home/$MY_USERNAME/.ssh
180
+          chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
181
+          # for security delete the ssh keys from the usb drive
182
+          shred -zu /media/usb/.ssh/id_rsa
183
+          shred -zu /media/usb/.ssh/id_rsa.pub
184
+          shred -zu /media/usb/.ssh/known_hosts
185
+          rm -rf /media/usb/.ssh
186
+      fi
187
+      if [ -f /media/usb/.emacs ]; then
188
+          echo 'Importing .emacs file'
189
+          cp -f /media/usb/.emacs /home/$MY_USERNAME/.emacs
190
+          chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs
191
+      fi
192
+      if [ -d /media/usb/.emacs.d ]; then
193
+          echo 'Importing .emacs.d directory'
194
+          cp -r /media/usb/.emacs.d /home/$MY_USERNAME/.emacs.d
195
+          chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs.d
196
+      fi
197
+      if [ -d /media/usb/personal ]; then
198
+          echo 'Importing personal directory'
199
+          cp -r /media/usb/personal /home/$MY_USERNAME/personal
200
+          chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
201
+      fi
200 202
   fi
201 203
   echo 'search_for_attached_usb_drive' >> $COMPLETION_FILE
202 204
 }
@@ -1145,13 +1147,13 @@ function import_email {
1145 1147
   fi
1146 1148
   if [ $IMPORT_MAILDIR ]; then
1147 1149
       if [ -d $IMPORT_MAILDIR ]; then
1148
-	      echo 'Transfering email files'
1149
-	      cp -r $IMPORT_MAILDIR/* /home/$MY_USERNAME/Maildir/
1150
-	      chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
1151
-	  else
1152
-		  echo "Email import directory $IMPORT_MAILDIR not found"
1153
-		  exit
1154
-	  fi
1150
+          echo 'Transfering email files'
1151
+          cp -r $IMPORT_MAILDIR/* /home/$MY_USERNAME/Maildir/
1152
+          chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
1153
+      else
1154
+          echo "Email import directory $IMPORT_MAILDIR not found"
1155
+          exit
1156
+      fi
1155 1157
   fi
1156 1158
   echo 'import_email' >> $COMPLETION_FILE
1157 1159
 }