Bob Mottram 10 anos atrás
pai
commit
0bbc72c362
1 arquivos alterados com 5 adições e 5 exclusões
  1. 5
    5
      install-freedombone.sh

+ 5
- 5
install-freedombone.sh Ver arquivo

@@ -916,7 +916,7 @@ function create_restore_script {
916 916
       echo '  BACKUP_MARIADB_PASSWORD=$(</root/tempmariadb/usb/backup/mariadb/tempmariadb/db)' >> /usr/bin/$RESTORE_SCRIPT_NAME
917 917
       echo '  echo "Restore the MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
918 918
       echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/usb/backup/mariadb/tempmariadb/mysql.sql)' >> /usr/bin/$RESTORE_SCRIPT_NAME
919
-      echo '  if [[ "$mysqlsuccess" == "ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
919
+      echo '  if [[ $mysqlsuccess == *"ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
920 920
       echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
921 921
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
922 922
       echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -926,7 +926,7 @@ function create_restore_script {
926 926
       echo '  rm -rf /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
927 927
       echo '  echo "Apply the new MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
928 928
       echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD "flush privileges;")' >> /usr/bin/$RESTORE_SCRIPT_NAME
929
-      echo '  if [[ "$mysqlsuccess" == "ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
929
+      echo '  if [[ $mysqlsuccess == *"ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
930 930
       echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
931 931
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
932 932
       echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -1029,7 +1029,7 @@ function create_restore_script {
1029 1029
       echo '    exit 503' >> /usr/bin/$RESTORE_SCRIPT_NAME
1030 1030
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1031 1031
       echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD gnusocial -o < /root/tempgnusocialdata/usb/backup/gnusocialdata/tempgnusocialdata/gnusocial.sql)' >> /usr/bin/$RESTORE_SCRIPT_NAME
1032
-      echo '  if [[ "$mysqlsuccess" == "ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1032
+      echo '  if [[ $mysqlsuccess == *"ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1033 1033
       echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1034 1034
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1035 1035
       echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -1064,7 +1064,7 @@ function create_restore_script {
1064 1064
       echo '    exit 504' >> /usr/bin/$RESTORE_SCRIPT_NAME
1065 1065
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1066 1066
       echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD redmatrix -o < /root/tempredmatrixdata/usb/backup/redmatrixdata/tempredmatrixdata/redmatrix.sql)' >> /usr/bin/$RESTORE_SCRIPT_NAME
1067
-      echo '  if [[ "$mysqlsuccess" == "ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1067
+      echo '  if [[ $mysqlsuccess == *"ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1068 1068
       echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1069 1069
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1070 1070
       echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -1099,7 +1099,7 @@ function create_restore_script {
1099 1099
       echo '    exit 505' >> /usr/bin/$RESTORE_SCRIPT_NAME
1100 1100
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1101 1101
       echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD owncloud -o < /root/tempownclouddata/usb/backup/ownclouddata/tempownclouddata/owncloud.sql)' >> /usr/bin/$RESTORE_SCRIPT_NAME
1102
-      echo '  if [[ "$mysqlsuccess" == "ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1102
+      echo '  if [[ $mysqlsuccess == *"ERROR"* ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1103 1103
       echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1104 1104
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1105 1105
       echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME