From 2daaf4557dd7014cae93d82174a74b02fc0166ed Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 15 Dec 2018 14:01:03 +0100 Subject: [PATCH] echo -E and \\\ --- conf/init_calibre_db_settings | 12 ++++++++++-- conf/init_calibre_db_user | 6 +++--- scripts/install | 6 +++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/conf/init_calibre_db_settings b/conf/init_calibre_db_settings index 0de6b44..f8f1515 100644 --- a/conf/init_calibre_db_settings +++ b/conf/init_calibre_db_settings @@ -1,2 +1,10 @@ -config_calibre_dir=\\"$calibre_dir\\", -config_port=$port \ No newline at end of file +config_calibre_dir=\\\"$calibre_dir\\\", +config_port=$port +config_certfile=\\\'\\\', +config_keyfile=\\\'\\\', +config_use_google_drive=0, +config_remote_login=0, +config_use_goodreads=0, +config_logfile=\\\'\\\', +config_converterpath=\\\'\\\', +config_calibre=\\\'\\\' \ No newline at end of file diff --git a/conf/init_calibre_db_user b/conf/init_calibre_db_user index 6452453..42e8037 100644 --- a/conf/init_calibre_db_user +++ b/conf/init_calibre_db_user @@ -1,3 +1,3 @@ -nickname=\"$admin\", -default_language=\'$language\', -password=\'$(python ../conf/generate_password_hash.py $password $final_path/vendor)\' \ No newline at end of file +nickname=\\\"$admin\\\", +default_language=\\\'$language\\\', +password=\\\'$(python ../conf/generate_password_hash.py $password $final_path/vendor)\\\' \ No newline at end of file diff --git a/scripts/install b/scripts/install index 872d7d8..a7156cb 100755 --- a/scripts/install +++ b/scripts/install @@ -142,13 +142,13 @@ sleep 5s systemctl stop $app #set database settings as per conf file -conf=$(. <(echo -e echo $(<../conf/init_calibre_db_settings))) +conf=$(. <(echo -E echo $(<../conf/init_calibre_db_settings))) echo $conf #sqlite3 ./app.db "UPDATE settings SET $conf WHERE ID=1" -sqlite3 ./app.db "UPDATE settings SET calibre_dir="$calibre_dir", calibre_port=$port WHERE ID=1" +sqlite3 ./app.db "UPDATE settings SET calibre_dir=\"$calibre_dir\", calibre_port=$port WHERE ID=1" -conf=$(. <(echo -e echo $(<../conf/init_calibre_db_user))) +conf=$(. <(echo -E echo $(<../conf/init_calibre_db_user))) sqlite3 $final_path/app.db "UPDATE user SET $conf WHERE ID=1"