diff --git a/conf/init_calibre_db_settings b/conf/init_calibre_db_settings index 4b0eec7..b9a0564 100644 --- a/conf/init_calibre_db_settings +++ b/conf/init_calibre_db_settings @@ -1,10 +1,10 @@ -config_calibre_dir=\\\"$calibre_dir\\\", +config_calibre_dir=\'$calibre_dir\', config_port=$port, -config_certfile=\\\"\\\", -config_keyfile=\\\"\\\", +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 +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 42e8037..1959002 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 68f3d42..5713a44 100755 --- a/scripts/install +++ b/scripts/install @@ -142,11 +142,12 @@ sleep 5s systemctl stop $app #set database settings as per conf file -conf=$(. <(echo -E echo $(<../conf/init_calibre_db_settings))) -#sqlite3 ./app.db "UPDATE settings SET $conf WHERE ID=1" +conf="\"UPDATE settings SET $(. <(echo -E echo $(<../conf/init_calibre_db_settings))) WHERE ID=1\"" +eval sqlite3 $final_path/app.db "$conf" -conf=$(. <(echo -E echo $(<../conf/init_calibre_db_user))) -#sqlite3 $final_path/app.db "UPDATE user SET $conf WHERE ID=1" + +conf="\"UPDATE user SET $(. <(echo -E echo $(<../conf/init_calibre_db_user))) WHERE ID=1\"" +eval sqlite3 $final_path/app.db "$conf"