Bob Mottram 10 년 전
부모
커밋
d9bb857331
1개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 6
    6
      install-freedombone.sh

+ 6
- 6
install-freedombone.sh 파일 보기

540
   if [ -f /home/$MY_USERNAME/README ]; then
540
   if [ -f /home/$MY_USERNAME/README ]; then
541
       if grep -q "MariaDB password" /home/$MY_USERNAME/README; then
541
       if grep -q "MariaDB password" /home/$MY_USERNAME/README; then
542
           if [ -f $DATABASE_PASSWORD_FILE ]; then
542
           if [ -f $DATABASE_PASSWORD_FILE ]; then
543
-              MARIADB_PASSWORD=$(<$DATABASE_PASSWORD_FILE)
543
+              MARIADB_PASSWORD=$(cat $DATABASE_PASSWORD_FILE)
544
           else
544
           else
545
               MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//')
545
               MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//')
546
               echo "$MARIADB_PASSWORD" > $DATABASE_PASSWORD_FILE
546
               echo "$MARIADB_PASSWORD" > $DATABASE_PASSWORD_FILE
622
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
622
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
623
 
623
 
624
   echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
624
   echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
625
-  echo -n 'DATABASE_PASSWORD=$(<' >> /usr/bin/$BACKUP_SCRIPT_NAME
625
+  echo -n 'DATABASE_PASSWORD=$(cat ' >> /usr/bin/$BACKUP_SCRIPT_NAME
626
   echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$BACKUP_SCRIPT_NAME
626
   echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$BACKUP_SCRIPT_NAME
627
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
627
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
628
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
628
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
1121
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1121
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1122
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1122
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1123
   echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
1123
   echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
1124
-  echo -n 'DATABASE_PASSWORD=$(<' >> /usr/bin/$RESTORE_SCRIPT_NAME
1124
+  echo -n 'DATABASE_PASSWORD=$(cat ' >> /usr/bin/$RESTORE_SCRIPT_NAME
1125
   echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$RESTORE_SCRIPT_NAME
1125
   echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$RESTORE_SCRIPT_NAME
1126
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1126
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1127
 
1127
 
1137
       echo '    echo "MariaDB password file not found"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1137
       echo '    echo "MariaDB password file not found"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1138
       echo '    exit 495' >> /usr/bin/$RESTORE_SCRIPT_NAME
1138
       echo '    exit 495' >> /usr/bin/$RESTORE_SCRIPT_NAME
1139
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1139
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1140
-      echo '  BACKUP_MARIADB_PASSWORD=$(</root/tempmariadb/usb/backup/mariadb/tempmariadb/db)' >> /usr/bin/$RESTORE_SCRIPT_NAME
1140
+      echo '  BACKUP_MARIADB_PASSWORD=$(cat /root/tempmariadb/usb/backup/mariadb/tempmariadb/db)' >> /usr/bin/$RESTORE_SCRIPT_NAME
1141
       echo '  if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1141
       echo '  if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1142
       echo '    echo "Restore the MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1142
       echo '    echo "Restore the MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1143
       echo '    mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/usb/backup/mariadb/tempmariadb/mysql.sql)' >> /usr/bin/$RESTORE_SCRIPT_NAME
1143
       echo '    mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/usb/backup/mariadb/tempmariadb/mysql.sql)' >> /usr/bin/$RESTORE_SCRIPT_NAME
4077
       echo '' >> /usr/bin/backupdatabases
4077
       echo '' >> /usr/bin/backupdatabases
4078
       echo "EMAIL='$MY_EMAIL_ADDRESS'" >> /usr/bin/backupdatabases
4078
       echo "EMAIL='$MY_EMAIL_ADDRESS'" >> /usr/bin/backupdatabases
4079
       echo '' >> /usr/bin/backupdatabases
4079
       echo '' >> /usr/bin/backupdatabases
4080
-      echo -n 'MYSQL_PASSWORD=$(<' >> /usr/bin/backupdatabases
4080
+      echo -n 'MYSQL_PASSWORD=$(cat ' >> /usr/bin/backupdatabases
4081
       echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/backupdatabases
4081
       echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/backupdatabases
4082
       echo 'umask 0077' >> /usr/bin/backupdatabases
4082
       echo 'umask 0077' >> /usr/bin/backupdatabases
4083
       echo '' >> /usr/bin/backupdatabases
4083
       echo '' >> /usr/bin/backupdatabases
4124
   echo 'DATABASE=$1' >> /usr/bin/repairdatabase
4124
   echo 'DATABASE=$1' >> /usr/bin/repairdatabase
4125
   echo "EMAIL=$MY_EMAIL_ADDRESS" >> /usr/bin/repairdatabase
4125
   echo "EMAIL=$MY_EMAIL_ADDRESS" >> /usr/bin/repairdatabase
4126
   echo '' >> /usr/bin/repairdatabase
4126
   echo '' >> /usr/bin/repairdatabase
4127
-  echo -n 'MYSQL_ROOT_PASSWORD=$(<' >> /usr/bin/repairdatabase
4127
+  echo -n 'MYSQL_ROOT_PASSWORD=$(cat ' >> /usr/bin/repairdatabase
4128
   echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/repairdatabase
4128
   echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/repairdatabase
4129
   echo 'TEMPFILE=/root/repairdatabase_$DATABASE' >> /usr/bin/repairdatabase
4129
   echo 'TEMPFILE=/root/repairdatabase_$DATABASE' >> /usr/bin/repairdatabase
4130
   echo '' >> /usr/bin/repairdatabase
4130
   echo '' >> /usr/bin/repairdatabase