diff --git a/scripts/seaf-fsck.sh b/scripts/seaf-fsck.sh index 2fd7629..6c08be5 100755 --- a/scripts/seaf-fsck.sh +++ b/scripts/seaf-fsck.sh @@ -20,15 +20,6 @@ function usage () { echo "" } -function validate_ccnet_conf_dir () { - if [[ ! -d ${default_ccnet_conf_dir} ]]; then - echo "Error: there is no ccnet config directory." - echo "Have you run setup-seafile.sh before this?" - echo "" - exit -1; - fi -} - function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -39,7 +30,6 @@ function validate_seafile_data_dir () { } function run_seaf_fsck () { - validate_ccnet_conf_dir; validate_seafile_data_dir; echo "Starting seaf-fsck, please wait ..." diff --git a/scripts/seaf-fuse.sh b/scripts/seaf-fuse.sh index a60b186..aad6c5d 100755 --- a/scripts/seaf-fuse.sh +++ b/scripts/seaf-fuse.sh @@ -36,15 +36,6 @@ if [[ $1 == "stop" && $# != 1 ]]; then exit 1 fi -function validate_ccnet_conf_dir () { - if [[ ! -d ${default_ccnet_conf_dir} ]]; then - echo "Error: there is no ccnet config directory." - echo "Have you run setup-seafile.sh before this?" - echo "" - exit -1; - fi -} - function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -73,7 +64,6 @@ function warning_if_seafile_not_running () { function start_seaf_fuse () { validate_already_running; warning_if_seafile_not_running; - validate_ccnet_conf_dir; validate_seafile_data_dir; echo "Starting seaf-fuse, please wait ..." diff --git a/scripts/seaf-gc.sh b/scripts/seaf-gc.sh index c210745..e8f0156 100755 --- a/scripts/seaf-gc.sh +++ b/scripts/seaf-gc.sh @@ -22,15 +22,6 @@ function usage () { } -function validate_ccnet_conf_dir () { - if [[ ! -d ${default_ccnet_conf_dir} ]]; then - echo "Error: there is no ccnet config directory." - echo "Have you run setup-seafile.sh before this?" - echo "" - exit -1; - fi -} - function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -61,7 +52,6 @@ function validate_already_running () { exit 1; fi - check_component_running "ccnet-server" "ccnet-server -c ${default_ccnet_conf_dir}" check_component_running "seaf-server" "seaf-server -c ${default_ccnet_conf_dir}" check_component_running "fileserver" "fileserver -c ${default_ccnet_conf_dir}" check_component_running "seafdav" "wsgidav.server.server_cli" @@ -69,7 +59,6 @@ function validate_already_running () { function run_seaf_gc () { validate_already_running; - validate_ccnet_conf_dir; validate_seafile_data_dir; echo "Starting seafserv-gc, please wait ..." diff --git a/scripts/seafile.sh b/scripts/seafile.sh index 5f3470b..2585e4e 100755 --- a/scripts/seafile.sh +++ b/scripts/seafile.sh @@ -48,15 +48,6 @@ function validate_running_user () { fi } -function validate_ccnet_conf_dir () { - if [[ ! -d ${default_ccnet_conf_dir} ]]; then - echo "Error: there is no ccnet config directory." - echo "Have you run setup-seafile.sh before this?" - echo "" - exit -1; - fi -} - function validate_central_conf_dir () { if [[ ! -d ${central_config_dir} ]]; then echo "Error: there is no conf/ directory." @@ -104,7 +95,6 @@ function validate_already_running () { function start_seafile_server () { validate_already_running; validate_central_conf_dir; - validate_ccnet_conf_dir; validate_seafile_data_dir; validate_running_user; diff --git a/scripts/seahub.sh b/scripts/seahub.sh index bcc076b..e4835bc 100755 --- a/scripts/seahub.sh +++ b/scripts/seahub.sh @@ -73,15 +73,6 @@ function check_python_executable() { fi } -function validate_ccnet_conf_dir () { - if [[ ! -d ${default_ccnet_conf_dir} ]]; then - echo "Error: there is no ccnet config directory." - echo "Have you run setup-seafile.sh before this?" - echo "" - exit -1; - fi -} - function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -198,7 +189,6 @@ function start_seahub_fastcgi () { function prepare_env() { check_python_executable; - validate_ccnet_conf_dir; validate_seafile_data_dir; if [[ -z "$LANG" ]]; then