From 603d7046b0b2a53185bdc35be07535e6eb3b2272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AC=A2=E4=B9=90=E9=A9=AC?=
 <38058090+SkywalkerSpace@users.noreply.github.com>
Date: Wed, 25 Nov 2020 11:45:41 +0800
Subject: [PATCH] fix setup sqlite (#422)

---
 scripts/seafile.sh       | 10 --------
 scripts/setup-seafile.sh | 53 ++++++++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/scripts/seafile.sh b/scripts/seafile.sh
index b7753a5..5f3470b 100755
--- a/scripts/seafile.sh
+++ b/scripts/seafile.sh
@@ -75,15 +75,6 @@ function validate_seafile_data_dir () {
     fi
 }
 
-function test_config() {
-    if ! LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_controller} --test \
-         -c "${default_ccnet_conf_dir}" \
-         -d "${default_seafile_data_dir}" \
-         -F "${central_config_dir}" ; then
-        exit 1;
-    fi
-}
-
 function check_component_running() {
     name=$1
     cmd=$2
@@ -116,7 +107,6 @@ function start_seafile_server () {
     validate_ccnet_conf_dir;
     validate_seafile_data_dir;
     validate_running_user;
-    test_config;
 
     echo "Starting seafile server, please wait ..."
 
diff --git a/scripts/setup-seafile.sh b/scripts/setup-seafile.sh
index a12a65f..bd987f7 100755
--- a/scripts/setup-seafile.sh
+++ b/scripts/setup-seafile.sh
@@ -285,6 +285,36 @@ function get_fileserver_port () {
 #     echo
 # }
 
+function gen_ccnet_conf () {
+    mkdir -p ${default_conf_dir}
+    ccnet_conf=${default_conf_dir}/ccnet.conf
+    if ! $(cat > ${ccnet_conf} <<EOF
+[General]
+SERVICE_URL = http://$ip_or_domain
+EOF
+); then
+    echo "failed to generate ccnet.conf";
+    err_and_quit
+fi
+
+mkdir -p ${default_ccnet_conf_dir}
+}
+
+function gen_seafile_conf () {
+    mkdir -p ${default_conf_dir}
+    seafile_conf=${default_conf_dir}/seafile.conf
+    if ! $(cat > ${seafile_conf} <<EOF
+[fileserver]
+port=$fileserver_port
+EOF
+); then
+    echo "failed to generate seafile.conf";
+    err_and_quit
+fi
+
+mkdir -p ${default_seafile_data_dir}
+}
+
 function gen_gunicorn_conf () {
     mkdir -p ${default_conf_dir}
     gunicorn_conf=${default_conf_dir}/gunicorn.conf.py
@@ -455,8 +485,6 @@ if [[ "${need_pause}" == "1" ]]; then
     read dummy
 fi
 
-ccnet_init=${INSTALLPATH}/seafile/bin/ccnet-init
-seaf_server_init=${INSTALLPATH}/seafile/bin/seaf-server-init
 
 # -------------------------------------------
 # Create ccnet conf 
@@ -464,33 +492,16 @@ seaf_server_init=${INSTALLPATH}/seafile/bin/seaf-server-init
 
 echo "Generating ccnet configuration in ${default_ccnet_conf_dir}..."
 echo
-if ! LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH "${ccnet_init}" \
-        -F "${default_conf_dir}" \
-        -c "${default_ccnet_conf_dir}" \
-        --host "${ip_or_domain}"; then
-    err_and_quit;
-fi
-
+gen_ccnet_conf;
 echo
 
-
-sleep 0.5
-
 # -------------------------------------------
 # Create seafile conf
 # -------------------------------------------
 
 echo "Generating seafile configuration in ${default_seafile_data_dir} ..."
 echo
-if ! LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_server_init} \
-        --central-config-dir "${default_conf_dir}" \
-        --seafile-dir "${default_seafile_data_dir}" \
-        --fileserver-port ${fileserver_port}; then
-    
-    echo "Failed to generate seafile configuration"
-    err_and_quit;
-fi
-
+gen_seafile_conf;
 echo