|
@@ -145,17 +145,17 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
|
145
|
145
|
export GPG_TTY
|
146
|
146
|
|
147
|
147
|
USER_EMAIL_ADDRESS=$MY_USERNAME@$HOSTNAME
|
148
|
|
- GPG_ID=$(gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
|
149
|
|
- GPG_BACKUP_ID=$(gpg --list-keys "(backup key)" | sed -n '2p' | sed 's/^[ \t]*//')
|
|
148
|
+ GPG_ID=$(su -m root -c "gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//'" - $MY_USERNAME)
|
|
149
|
+ GPG_BACKUP_ID=$(su -m root -c "gpg --list-keys \"(backup key)\" | sed -n '2p' | sed 's/^[ \t]*//'" - $MY_USERNAME)
|
150
|
150
|
|
151
|
151
|
gpgerrstr=$'error'
|
152
|
|
- gpgkey=$(gpg --armor --export $GPG_ID)
|
|
152
|
+ gpgkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export $GPG_ID)
|
153
|
153
|
if [[ "$gpgkey" == *"$gpgerrstr"* ]]; then
|
154
|
154
|
echo $'Problem exporting public gpg key'
|
155
|
155
|
echo "$gpgkey"
|
156
|
156
|
exit 735282
|
157
|
157
|
fi
|
158
|
|
- gpgprivkey=$(gpg --armor --export-secret-key $GPG_ID)
|
|
158
|
+ gpgprivkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_ID)
|
159
|
159
|
if [[ "$gpgprivkey" == *"$gpgerrstr"* ]]; then
|
160
|
160
|
echo $'Problem exporting private gpg key'
|
161
|
161
|
echo "$gpgprivkey"
|
|
@@ -163,17 +163,17 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
|
163
|
163
|
exit 629362
|
164
|
164
|
fi
|
165
|
165
|
|
166
|
|
- backupgpgkey=$(gpg --armor --export $GPG_BACKUP_ID)
|
|
166
|
+ backupgpgkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export $GPG_BACKUP_ID)
|
167
|
167
|
if [[ "$backupgpgkey" == *"$gpgerrstr"* ]]; then
|
168
|
168
|
echo $'Problem exporting public gpg backup key'
|
169
|
169
|
echo "$backupgpgkey"
|
170
|
170
|
exit 735282
|
171
|
171
|
fi
|
172
|
|
- backupgpgprivkey=$(gpg --armor --export-secret-key $GPG_BACKUP_ID)
|
|
172
|
+ backupgpgprivkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_BACKUP_ID)
|
173
|
173
|
if [[ "$backupgpgprivkey" == *"$gpgerrstr"* ]]; then
|
174
|
174
|
echo $'Problem exporting private gpg backup key'
|
175
|
175
|
echo "$backupgpgprivkey"
|
176
|
|
- gpgprivkey=
|
|
176
|
+ backupgpgprivkey=
|
177
|
177
|
exit 629362
|
178
|
178
|
fi
|
179
|
179
|
|