feat: update build

build/bin/wfccontrol.sh

@@ -1,23 +1,10 @@
 #!/bin/bash
 
 WFCWorkDir=/opt/wfc
+WFCBinDir=${WFCWorkDir}/bin
 DockerDir=${WFCWorkDir}/docker
 DockerCompose=/usr/bin/docker-compose
-
-usage() {
-	echo "Usage: sh wfccontrol.sh [start|stop|status|version]"
-	exit 1
-}
-
-start(){
-	cd ${DockerDir}
-	${DockerCompose} up -d
-}
-
-stop(){
-	cd ${DockerDir}
-	${DockerCompose} down
-}
+PIDFile=/run/wfccontrol.pid
 
 Jars=" \
     /opt/wfc/docker/wfc/auth/jar/wfc-auth.jar \
@@ -30,30 +17,33 @@ Jars=" \
     /opt/wfc/docker/wfc/modules/payment/jar/wfc-modules-payment.jar \
     "
 
-status(){
-	cd ${DockerDir}
-	${DockerCompose} ps
-}
-
-# print wfc version
-version(){
-	java printJarVer ${Jars}
-}
-
 case "$1" in
-	"start")
-		start
+	start)
+        cd ${DockerDir}
+        ${DockerCompose} up -d
+        echo $! > ${PIDFile}
 	;;
-	"stop")
-		stop
+	stop)
+        cd ${DockerDir}
+        ${DockerCompose} down
+        rm ${PIDFile}
 	;;
-	"status")
-		status
+	restart)
+		$0 stop
+        sleep 1        
+        $0 start
+	;;    
+	status)
+        cd ${DockerDir}
+        ${DockerCompose} ps
 	;;	
-	"version")
-		version
+	version)
+        cd ${WFCBinDir}
+        java printJarVer ${Jars}
 	;;
 	*)
-		usage
+        echo "WANFi Controller Service"
+        echo "Usage: $0 start|stop|restart|status|version"
+        exit 1
 	;;
 esac

build/bin/wfcsetup.sh

@@ -6,10 +6,10 @@ SrcServiceDir=${WFCWorkDir}/systemd/system
 DstServiceDir=/etc/systemd/system
 
 # prepare directory
-ln -sf /tmp ${DockerWorkDir}/mysql/
+mkdir -p ${DockerWorkDir}/mysql/tmp
 chown -R root:root ${DockerWorkDir}/*
 chown -R mysql:mysql ${DockerWorkDir}/mysql
-chmod -R 755 ${DockerWorkDir}/mysql/*
+chmod -R 777 ${DockerWorkDir}/mysql/tmp
 
 # setup system serivce 
 cp -rf ${SrcServiceDir}/wfccontrol.service ${DstServiceDir}/
@@ -18,5 +18,6 @@ systemctl enable wfccontrol.service
 
 # build docker compose
 cd ${DockerWorkDir}
+docker-compose down
 docker-compose build