浏览代码

Only remove files if they were coppied

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

+ 20
- 10
install-freedombone.sh 查看文件

153
   if [ -b $USB_DRIVE ]; then
153
   if [ -b $USB_DRIVE ]; then
154
       if [ ! -d /media/usb ]; then
154
       if [ ! -d /media/usb ]; then
155
           echo 'Mounting USB drive'
155
           echo 'Mounting USB drive'
156
-		  mkdir /media/usb
156
+          mkdir /media/usb
157
           mount $USB_DRIVE /media/usb
157
           mount $USB_DRIVE /media/usb
158
       fi
158
       fi
159
       if [ -d /media/usb/Maildir ]; then
159
       if [ -d /media/usb/Maildir ]; then
164
           echo 'Importing GPG keyring'
164
           echo 'Importing GPG keyring'
165
           cp -r /media/usb/.gnupg /home/$MY_USERNAME
165
           cp -r /media/usb/.gnupg /home/$MY_USERNAME
166
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
166
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
167
-          shred -zu /media/usb/.gnupg/secring.gpg
168
-          shred -zu /media/usb/.gnupg/random_seed
169
-          shred -zu /media/usb/.gnupg/trustdb.gpg
170
-          rm -rf /media/usb/.gnupg
167
+          if [ -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
168
+              shred -zu /media/usb/.gnupg/secring.gpg
169
+              shred -zu /media/usb/.gnupg/random_seed
170
+              shred -zu /media/usb/.gnupg/trustdb.gpg
171
+              rm -rf /media/usb/.gnupg
172
+          else
173
+              echo 'GPG files did not copy'
174
+              exit
175
+          fi
171
       fi
176
       fi
172
       if [ -f /media/usb/private_key.gpg ]; then
177
       if [ -f /media/usb/private_key.gpg ]; then
173
           echo 'GPG private key found on USB drive'
178
           echo 'GPG private key found on USB drive'
182
           cp -r /media/usb/.ssh /home/$MY_USERNAME
187
           cp -r /media/usb/.ssh /home/$MY_USERNAME
183
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
188
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
184
           # for security delete the ssh keys from the usb drive
189
           # for security delete the ssh keys from the usb drive
185
-          shred -zu /media/usb/.ssh/id_rsa
186
-          shred -zu /media/usb/.ssh/id_rsa.pub
187
-          shred -zu /media/usb/.ssh/known_hosts
188
-          rm -rf /media/usb/.ssh
190
+          if [ -f /home/$MY_USERNAME/.ssh/id_rsa ]; then
191
+              shred -zu /media/usb/.ssh/id_rsa
192
+              shred -zu /media/usb/.ssh/id_rsa.pub
193
+              shred -zu /media/usb/.ssh/known_hosts
194
+              rm -rf /media/usb/.ssh
195
+          else
196
+              echo 'ssh files did not copy'
197
+              exit
198
+          fi
189
       fi
199
       fi
190
       if [ -f /media/usb/.emacs ]; then
200
       if [ -f /media/usb/.emacs ]; then
191
           echo 'Importing .emacs file'
201
           echo 'Importing .emacs file'
204
       fi
214
       fi
205
   else
215
   else
206
       if [ -d /media/usb ]; then
216
       if [ -d /media/usb ]; then
207
-		  umount /media/usb
217
+          umount /media/usb
208
           rm -rf /media/usb
218
           rm -rf /media/usb
209
       fi
219
       fi
210
       echo 'No USB drive attached'
220
       echo 'No USB drive attached'