Browse Source

Fix invalid characters

Bob Mottram 11 years ago
parent
commit
e5c592d994
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      install-freedombone.sh

+ 6
- 6
install-freedombone.sh View File

@@ -149,7 +149,7 @@ function change_login_message {
149 149
       echo '                 :    |             | ' >> /etc/motd
150 150
       echo '                 |    | .-. .  . .-.| ' >> /etc/motd
151 151
       echo '                 :    |(   )|  |(   | ' >> /etc/motd
152
-      echo "                   --' - -' `-- - -' -" >> /etc/motd
152
+      echo "                   --' - -'  -- - -' -" >> /etc/motd
153 153
   fi
154 154
 
155 155
   if [ $SYSTEM_TYPE == "chat" ]; then
@@ -163,9 +163,9 @@ function change_login_message {
163 163
   if [ $SYSTEM_TYPE == "social" ]; then
164 164
       echo '               .-.                    .  ' >> /etc/motd
165 165
       echo '              (   )           o       |  ' >> /etc/motd
166
-      echo '               `-.  .-.  .-.  .  .-.  |  ' >> /etc/motd
166
+      echo '                -.  .-.  .-.  .  .-.  |  ' >> /etc/motd
167 167
       echo '              (   )(   )(     | (   ) |  ' >> /etc/motd
168
-      echo "               `-'  `-'   -'-'  - -' - - " >> /etc/motd
168
+      echo "                -'   -'   -'-'  - -' - - " >> /etc/motd
169 169
   fi
170 170
 
171 171
   if [[ $SYSTEM_TYPE == "email" || $SYSTEM_TYPE == "mailbox" ]]; then
@@ -173,7 +173,7 @@ function change_login_message {
173 173
       echo '             |\  /|        o  | |              ' >> /etc/motd
174 174
       echo '             | \/ | .-.    .  | |.-.  .-.-. ,- ' >> /etc/motd
175 175
       echo '             |    |(   )   |  | |   )(   ) :   ' >> /etc/motd
176
-      echo '             '    ' `-' --'  - -' -'  `-'-' `- ' >> /etc/motd
176
+      echo '             '    '  -' --'  - -' -'   -'-'  - ' >> /etc/motd
177 177
   fi
178 178
 
179 179
   echo '' >> /etc/motd
@@ -1034,8 +1034,8 @@ function configure_gpg {
1034 1034
       echo 'Key-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
1035 1035
       echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
1036 1036
       echo 'Subkey-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
1037
-      echo "Name-Real:  `hostname --fqdn`" >> /home/$MY_USERNAME/gpg-genkey.conf
1038
-      echo "Name-Email: $MY_USERNAME@`hostname --fqdn`" >> /home/$MY_USERNAME/gpg-genkey.conf
1037
+      echo "Name-Real:  $MY_USERNAME@$DOMAIN_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1038
+      echo "Name-Email: $MY_USERNAME@$DOMAIN_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1039 1039
       echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1040 1040
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1041 1041
       su -c "gpg --batch --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME