diff --git a/conf/init_calibre_db_settings b/conf/init_calibre_db_settings index 3724c51..770abd2 100644 --- a/conf/init_calibre_db_settings +++ b/conf/init_calibre_db_settings @@ -1,10 +1,10 @@ -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 +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 fc0cd29..6452453 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 6877ec1..f4a4942 100755 --- a/scripts/install +++ b/scripts/install @@ -142,13 +142,12 @@ sleep 5s systemctl stop $app #set database settings as per conf file -while IFS='' read -r i || [[ -n "$i" ]]; do - sqlite3 $final_path/app.db "UPDATE settings SET $i WHERE ID=1" -done < ../conf/init_calibre_db_settings +conf=$(. <(echo -e echo $(<../conf/init_calibre_db_settings))) +sqlite3 ./app.db "UPDATE settings SET $conf WHERE ID=1" + +conf=$(. <(echo -e echo $(<../conf/init_calibre_db_user))) +sqlite3 $final_path/app.db "UPDATE user SET $conf WHERE ID=1" -while IFS='' read -r i || [[ -n "$i" ]]; do - sqlite3 $final_path/app.db "UPDATE user SET $i WHERE ID=1" -done < ../conf/init_calibre_db_user