Bob Mottram vor 10 Jahren
Ursprung
Commit
a53e52aadb
1 geänderte Dateien mit 16 neuen und 1 gelöschten Zeilen
  1. 16
    1
      install-freedombone.sh

+ 16
- 1
install-freedombone.sh Datei anzeigen

@@ -145,16 +145,18 @@ function change_login_message {
145 145
 
146 146
 function search_for_attached_usb_drive {
147 147
   # If a USB drive is attached then search for email,
148
-  # gpg and ssh keys and change the directories accordingly
148
+  # gpg, ssh keys and emacs configuration
149 149
   if grep -Fxq "search_for_attached_usb_drive" $COMPLETION_FILE; then
150 150
       return
151 151
   fi
152 152
   if [ -d $USB_DRIVE ]; then
153 153
 	  mount $USB_DRIVE /media/usb
154 154
 	  if [ -d /media/usb/Maildir ]; then
155
+		  echo 'Maildir found on USB drive'
155 156
 		  IMPORT_MAILDIR=/media/usb/Maildir
156 157
 	  fi
157 158
 	  if [ -d /media/usb/.gnupg ]; then
159
+		  echo 'Importing GPG keyring'
158 160
 		  cp -r /media/usb/.gnupg /home/$MY_USERNAME/.gnupg
159 161
 		  chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
160 162
 		  shred -zu /media/usb/.gnupg/secring.gpg
@@ -163,12 +165,15 @@ function search_for_attached_usb_drive {
163 165
 		  rm -rf /media/usb/.gnupg
164 166
 	  fi
165 167
 	  if [ -f /media/usb/private_key.gpg ]; then
168
+		  echo 'GPG private key found on USB drive'
166 169
 		  MY_GPG_PRIVATE_KEY=/media/usb/private_key.gpg
167 170
 	  fi
168 171
 	  if [ -f /media/usb/public_key.gpg ]; then
172
+		  echo 'GPG public key found on USB drive'
169 173
 		  MY_GPG_PUBLIC_KEY=/media/usb/public_key.gpg
170 174
 	  fi
171 175
 	  if [ -d /media/usb/.ssh ]; then
176
+		  echo 'Importing ssh keys'
172 177
 		  cp -r /media/usb/.ssh /home/$MY_USERNAME/.ssh
173 178
 		  chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
174 179
 		  # for security delete the ssh keys from the usb drive
@@ -177,6 +182,16 @@ function search_for_attached_usb_drive {
177 182
 		  shred -zu /media/usb/.ssh/known_hosts
178 183
 		  rm -rf /media/usb/.ssh
179 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
180 195
   fi
181 196
   echo 'search_for_attached_usb_drive' >> $COMPLETION_FILE
182 197
 }