From 7f847c5ccdb9fcf4d05fa506c8cf9576a19b2998 Mon Sep 17 00:00:00 2001 From: sniper-py Date: Tue, 3 Dec 2019 14:00:20 +0800 Subject: [PATCH] update --- scripts/reset-admin.sh | 6 +++--- scripts/seaf-fsck.sh | 6 +++--- scripts/seaf-fuse.sh | 6 +++--- scripts/seaf-gc.sh | 6 +++--- scripts/seafile.sh | 6 +++--- scripts/seahub.sh | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/reset-admin.sh b/scripts/reset-admin.sh index c3aa07e..a77e105 100755 --- a/scripts/reset-admin.sh +++ b/scripts/reset-admin.sh @@ -4,8 +4,8 @@ SCRIPT=$(readlink -f "$0") INSTALLPATH=$(dirname "${SCRIPT}") TOPDIR=$(dirname "${INSTALLPATH}") default_ccnet_conf_dir=${TOPDIR}/ccnet -central_config_dir=${TOPDIR}/conf default_seafile_data_dir=${TOPDIR}/seafile-data +central_config_dir=${TOPDIR}/conf function check_python_executable() { if [[ "$PYTHON" != "" && -x $PYTHON ]]; then @@ -34,8 +34,8 @@ function check_python_executable() { function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then - echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." - echo "Please check it first, or create this directory yourself." + echo "Error: there is no seafile server data directory." + echo "Have you run setup-seafile.sh before this?" echo "" exit 1; fi diff --git a/scripts/seaf-fsck.sh b/scripts/seaf-fsck.sh index 6eeeaad..2fd7629 100755 --- a/scripts/seaf-fsck.sh +++ b/scripts/seaf-fsck.sh @@ -6,9 +6,9 @@ SCRIPT=$(readlink -f "$0") INSTALLPATH=$(dirname "${SCRIPT}") TOPDIR=$(dirname "${INSTALLPATH}") default_ccnet_conf_dir=${TOPDIR}/ccnet +default_seafile_data_dir=${TOPDIR}/seafile-data default_conf_dir=${TOPDIR}/conf seaf_fsck=${INSTALLPATH}/seafile/bin/seaf-fsck -default_seafile_data_dir=${TOPDIR}/seafile-data export PATH=${INSTALLPATH}/seafile/bin:$PATH export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} @@ -31,8 +31,8 @@ function validate_ccnet_conf_dir () { function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then - echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." - echo "Please check it first, or create this directory yourself." + echo "Error: there is no seafile server data directory." + echo "Have you run setup-seafile.sh before this?" echo "" exit 1; fi diff --git a/scripts/seaf-fuse.sh b/scripts/seaf-fuse.sh index b853d9c..a60b186 100755 --- a/scripts/seaf-fuse.sh +++ b/scripts/seaf-fuse.sh @@ -6,9 +6,9 @@ SCRIPT=$(readlink -f "$0") INSTALLPATH=$(dirname "${SCRIPT}") TOPDIR=$(dirname "${INSTALLPATH}") default_ccnet_conf_dir=${TOPDIR}/ccnet +default_seafile_data_dir=${TOPDIR}/seafile-data default_conf_dir=${TOPDIR}/conf seaf_fuse=${INSTALLPATH}/seafile/bin/seaf-fuse -default_seafile_data_dir=${TOPDIR}/seafile-data export PATH=${INSTALLPATH}/seafile/bin:$PATH export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} @@ -47,8 +47,8 @@ function validate_ccnet_conf_dir () { function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then - echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." - echo "Please check it first, or create this directory yourself." + echo "Error: there is no seafile server data directory." + echo "Have you run setup-seafile.sh before this?" echo "" exit 1; fi diff --git a/scripts/seaf-gc.sh b/scripts/seaf-gc.sh index bb92c60..7537b57 100755 --- a/scripts/seaf-gc.sh +++ b/scripts/seaf-gc.sh @@ -6,10 +6,10 @@ SCRIPT=$(readlink -f "$0") INSTALLPATH=$(dirname "${SCRIPT}") TOPDIR=$(dirname "${INSTALLPATH}") default_ccnet_conf_dir=${TOPDIR}/ccnet +default_seafile_data_dir=${TOPDIR}/seafile-data default_conf_dir=${TOPDIR}/conf seaf_gc=${INSTALLPATH}/seafile/bin/seafserv-gc seaf_gc_opts="" -default_seafile_data_dir=${TOPDIR}/seafile-data export PATH=${INSTALLPATH}/seafile/bin:$PATH export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} @@ -33,8 +33,8 @@ function validate_ccnet_conf_dir () { function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then - echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." - echo "Please check it first, or create this directory yourself." + echo "Error: there is no seafile server data directory." + echo "Have you run setup-seafile.sh before this?" echo "" exit 1; fi diff --git a/scripts/seafile.sh b/scripts/seafile.sh index 1ac235b..3b4f879 100755 --- a/scripts/seafile.sh +++ b/scripts/seafile.sh @@ -16,9 +16,9 @@ SCRIPT=$(readlink -f "$0") INSTALLPATH=$(dirname "${SCRIPT}") TOPDIR=$(dirname "${INSTALLPATH}") default_ccnet_conf_dir=${TOPDIR}/ccnet +default_seafile_data_dir=${TOPDIR}/seafile-data central_config_dir=${TOPDIR}/conf seaf_controller="${INSTALLPATH}/seafile/bin/seafile-controller" -default_seafile_data_dir=${TOPDIR}/seafile-data export PATH=${INSTALLPATH}/seafile/bin:$PATH export ORIG_LD_LIBRARY_PATH=${LD_LIBRARY_PATH} @@ -68,8 +68,8 @@ function validate_central_conf_dir () { function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then - echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." - echo "Please check it first, or create this directory yourself." + echo "Error: there is no seafile server data directory." + echo "Have you run setup-seafile.sh before this?" echo "" exit 1; fi diff --git a/scripts/seahub.sh b/scripts/seahub.sh index cb2d856..c53e527 100755 --- a/scripts/seahub.sh +++ b/scripts/seahub.sh @@ -16,8 +16,8 @@ SCRIPT=$(readlink -f "$0") INSTALLPATH=$(dirname "${SCRIPT}") TOPDIR=$(dirname "${INSTALLPATH}") default_ccnet_conf_dir=${TOPDIR}/ccnet -central_config_dir=${TOPDIR}/conf default_seafile_data_dir=${TOPDIR}/seafile-data +central_config_dir=${TOPDIR}/conf manage_py=${INSTALLPATH}/seahub/manage.py gunicorn_conf=${TOPDIR}/conf/gunicorn.conf @@ -83,8 +83,8 @@ function validate_ccnet_conf_dir () { function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then - echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." - echo "Please check it first, or create this directory yourself." + echo "Error: there is no seafile server data directory." + echo "Have you run setup-seafile.sh before this?" echo "" exit 1; fi