Merge branch 'fix/buildStart' into 'release'

Fix/build start

See merge request o2oa/o2oa!1741

o2server/console_raspi.sh

@@ -1 +1 @@
-sudo $(cd "$(dirname "$0")"; pwd)/jvm/raspberrypi/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
+sudo $(cd "$(dirname "$0")"; pwd)/jvm/raspi/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow

o2server/start_aix.sh

@@ -108,29 +108,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/

o2server/start_aix_debug.sh

@@ -108,29 +108,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/

o2server/start_arm.sh

@@ -108,29 +108,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/

o2server/start_arm_debug.sh

@@ -108,29 +108,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/

o2server/start_linux.sh

@@ -108,29 +108,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/

o2server/start_linux_debug.sh

@@ -108,29 +108,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/

o2server/start_macos.sh

@@ -109,26 +109,26 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/

o2server/start_macos_debug.sh

@@ -109,29 +109,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/

o2server/start_mips.sh

@@ -108,17 +108,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_mips.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/

o2server/start_mips_debug.sh

@@ -108,17 +108,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_mips.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/

o2server/start_raspi.sh

@@ -120,17 +120,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
 		sudo rm -Rf ${current_dir}/local/update
 	fi
 fi
-sudo setsid ${current_dir}/jvm/raspberrypi/bin/java -javaagent:${current_dir}/console.jar -server -Xms1g -Xmx2g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+sudo setsid ${current_dir}/jvm/raspi/bin/java -javaagent:${current_dir}/console.jar -server -Xms1g -Xmx2g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar

o2server/start_raspi_debug.sh

@@ -120,17 +120,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/raspi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
 		sudo rm -Rf ${current_dir}/local/update
 	fi
 fi
-sudo setsid ${current_dir}/jvm/raspberrypi/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms1g -Xmx2g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+sudo setsid ${current_dir}/jvm/raspi/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms1g -Xmx2g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar

o2server/start_windows.bat

@@ -103,29 +103,29 @@ if exist "%~dp0local\update" (
 		if exist "%~dp0console_aix.sh" (
 			copy "%~dp0local\update\o2server\console_aix.sh" "%~dp0"
 		)
-		if exist "%~dp0start_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\start_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0start_raspi.sh" (
+			copy "%~dp0local\update\o2server\start_raspi.sh" "%~dp0"
 		)
-		if exist "%~dp0start_raspberrypi_debug.sh" (
-			copy "%~dp0local\update\o2server\start_raspberrypi_debug.sh" "%~dp0"
+		if exist "%~dp0start_raspi_debug.sh" (
+			copy "%~dp0local\update\o2server\start_raspi_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\stop_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0stop_raspi.sh" (
+			copy "%~dp0local\update\o2server\stop_raspi.sh" "%~dp0"
 		)
-		if exist "%~dp0console_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0console_raspi.sh" (
+			copy "%~dp0local\update\o2server\console_raspi.sh" "%~dp0"
 		)
-		if exist "%~dp0start_risc.sh" (
-			copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0"
+		if exist "%~dp0start_mips.sh" (
+			copy "%~dp0local\update\o2server\start_mips.sh" "%~dp0"
 		)
-		if exist "%~dp0start_risc_debug.sh" (
-			copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0"
+		if exist "%~dp0start_mips_debug.sh" (
+			copy "%~dp0local\update\o2server\start_mips_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_risc.sh" (
-			copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0"
+		if exist "%~dp0stop_mips.sh" (
+			copy "%~dp0local\update\o2server\stop_mips.sh" "%~dp0"
 		)
-		if exist "%~dp0console_risc.sh" (
-			copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0"
+		if exist "%~dp0console_mips.sh" (
+			copy "%~dp0local\update\o2server\console_mips.sh" "%~dp0"
 		)
 		if exist "%~dp0start_arm.sh" (
 			copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0"

o2server/start_windows_debug.bat

@@ -103,29 +103,29 @@ if exist "%~dp0local\update" (
 		if exist "%~dp0console_aix.sh" (
 			copy "%~dp0local\update\o2server\console_aix.sh" "%~dp0"
 		)
-		if exist "%~dp0start_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\start_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0start_raspi.sh" (
+			copy "%~dp0local\update\o2server\start_raspi.sh" "%~dp0"
 		)
-		if exist "%~dp0start_raspberrypi_debug.sh" (
-			copy "%~dp0local\update\o2server\start_raspberrypi_debug.sh" "%~dp0"
+		if exist "%~dp0start_raspi_debug.sh" (
+			copy "%~dp0local\update\o2server\start_raspi_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\stop_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0stop_raspi.sh" (
+			copy "%~dp0local\update\o2server\stop_raspi.sh" "%~dp0"
 		)
-		if exist "%~dp0console_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0console_raspi.sh" (
+			copy "%~dp0local\update\o2server\console_raspi.sh" "%~dp0"
 		)
-		if exist "%~dp0start_risc.sh" (
-			copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0"
+		if exist "%~dp0start_mips.sh" (
+			copy "%~dp0local\update\o2server\start_mips.sh" "%~dp0"
 		)
-		if exist "%~dp0start_risc_debug.sh" (
-			copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0"
+		if exist "%~dp0start_mips_debug.sh" (
+			copy "%~dp0local\update\o2server\start_mips_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_risc.sh" (
-			copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0"
+		if exist "%~dp0stop_mips.sh" (
+			copy "%~dp0local\update\o2server\stop_mips.sh" "%~dp0"
 		)
-		if exist "%~dp0console_risc.sh" (
-			copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0"
+		if exist "%~dp0console_mips.sh" (
+			copy "%~dp0local\update\o2server\console_mips.sh" "%~dp0"
 		)
 		if exist "%~dp0start_arm.sh" (
 			copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0"

o2server/stop_mips.sh

@@ -1 +1 @@
-$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
+$(cd "$(dirname "$0")"; pwd)/jvm/mips/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit

o2server/stop_raspi.sh

@@ -1 +1 @@
-sudo $(cd "$(dirname "$0")"; pwd)/jvm/raspberrypi/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
+sudo $(cd "$(dirname "$0")"; pwd)/jvm/raspi/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit