瀏覽代碼

Fix output

dennisro 7 年之前
父節點
當前提交
e2ac2d34a2
共有 2 個文件被更改,包括 3 次插入7 次删除
  1. 2 6
      data/services/seafilepro/containers.sh
  2. 1 1
      data/services/seafilepro/seafilepro.sh

+ 2 - 6
data/services/seafilepro/containers.sh

@@ -9,18 +9,14 @@ seafilepro_db_dockerbunker() {
 		--env MYSQL_USER=${DBUSER} \
 		--env MYSQL_PASSWORD=${DBPASS} \
 	${IMAGES[db]} >/dev/null
+	exit_response
 
 	if [[ -z $keep_volumes ]];then
 		if ! docker exec seafilepro-db-dockerbunker mysqladmin ping -h"127.0.0.1" --silent;then
-			echo -en "Waiting for Seafile DB to be ready..."
+			echo -en "\n\e[3m\xe2\x86\x92 Waiting for Seafile DB to be ready...\n"
 			while ! docker exec seafilepro-db-dockerbunker mysqladmin ping -h"127.0.0.1" --silent;do
 				sleep 3
 			done
-			if [ $? != 1 ];then
-				echo -e " \e[32m\xE2\x9C\x94\e[0m"
-			else
-				echo  -e " \e[31mfailed\e[0m"
-			fi
 		fi
 	fi
 }

+ 1 - 1
data/services/seafilepro/seafilepro.sh

@@ -31,7 +31,7 @@ upgrade() {
 	stop_containers
 	remove_containers
 
-	echo -en "\n\e[1mStarting up ${PROPER_NAME} upgrade container\e[0m" \
+	echo -e "\n\e[1mStarting up ${PROPER_NAME} upgrade container\e[0m" \
 		&& seafilepro_setup_dockerbunker "upgrade $SF_VERSION" \
 		&& exit_response