Bob Mottram 10 年之前
父節點
當前提交
1457d3c2fc
共有 1 個檔案被更改,包括 5 行新增5 行删除
  1. 5
    5
      install-freedombone.sh

+ 5
- 5
install-freedombone.sh 查看文件

162
       fi
162
       fi
163
       if [ -d /media/usb/.gnupg ]; then
163
       if [ -d /media/usb/.gnupg ]; then
164
           echo 'Importing GPG keyring'
164
           echo 'Importing GPG keyring'
165
-          cp -r /media/usb/.gnupg /home/$MY_USERNAME/.gnupg
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
167
           shred -zu /media/usb/.gnupg/secring.gpg
168
           shred -zu /media/usb/.gnupg/random_seed
168
           shred -zu /media/usb/.gnupg/random_seed
179
       fi
179
       fi
180
       if [ -d /media/usb/.ssh ]; then
180
       if [ -d /media/usb/.ssh ]; then
181
           echo 'Importing ssh keys'
181
           echo 'Importing ssh keys'
182
-          cp -r /media/usb/.ssh /home/$MY_USERNAME/.ssh
182
+          cp -r /media/usb/.ssh /home/$MY_USERNAME
183
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
183
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
184
           # for security delete the ssh keys from the usb drive
184
           # for security delete the ssh keys from the usb drive
185
           shred -zu /media/usb/.ssh/id_rsa
185
           shred -zu /media/usb/.ssh/id_rsa
194
       fi
194
       fi
195
       if [ -d /media/usb/.emacs.d ]; then
195
       if [ -d /media/usb/.emacs.d ]; then
196
           echo 'Importing .emacs.d directory'
196
           echo 'Importing .emacs.d directory'
197
-          cp -r /media/usb/.emacs.d /home/$MY_USERNAME/.emacs.d
197
+          cp -r /media/usb/.emacs.d /home/$MY_USERNAME
198
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs.d
198
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs.d
199
       fi
199
       fi
200
       if [ -d /media/usb/personal ]; then
200
       if [ -d /media/usb/personal ]; then
201
           echo 'Importing personal directory'
201
           echo 'Importing personal directory'
202
-          cp -r /media/usb/personal /home/$MY_USERNAME/personal
202
+          cp -r /media/usb/personal /home/$MY_USERNAME
203
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
203
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
204
       fi
204
       fi
205
   else
205
   else
1196
   if [ $IMPORT_MAILDIR ]; then
1196
   if [ $IMPORT_MAILDIR ]; then
1197
       if [ -d $IMPORT_MAILDIR ]; then
1197
       if [ -d $IMPORT_MAILDIR ]; then
1198
           echo 'Transfering email files'
1198
           echo 'Transfering email files'
1199
-          cp -r $IMPORT_MAILDIR/* /home/$MY_USERNAME/Maildir/
1199
+          cp -r $IMPORT_MAILDIR /home/$MY_USERNAME
1200
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
1200
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
1201
       else
1201
       else
1202
           echo "Email import directory $IMPORT_MAILDIR not found"
1202
           echo "Email import directory $IMPORT_MAILDIR not found"