From 030381aa5c90e3143dd482aba884630871702fca Mon Sep 17 00:00:00 2001
From: xin <renlixin@iris-rs.cn>
Date: Thu, 8 May 2025 13:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E7=AB=8B=E6=96=B0=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AF=A5=E6=B8=A9=E6=8E=A7=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore           |  1 +
 deb_pack.sh          | 23 ++++++++++++++---------
 install.sh           |  6 ++++++
 othersoft/install.sh | 10 +++++-----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index cfe86b7..d582d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /othersoft/calibration_console/cmake-build-debug/
 /othersoft/TemperatureControler/project/cmake-build-debug-towersif/
 /othersoft/TemperatureControler/project/cmake-build-debug-towersif/
+/DEB/
diff --git a/deb_pack.sh b/deb_pack.sh
index 46ac753..b923fc8 100755
--- a/deb_pack.sh
+++ b/deb_pack.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 
 # 检查是否提供了版本号参数
-if [ $# -eq 0 ]; then
-    echo "错误：请提供版本号参数"
-    echo "用法: $0 <版本号>"
-    exit 1
-fi
+#if [ $# -eq 0 ]; then
+#    echo "错误：请提供版本号参数"
+#    echo "用法: $0 <版本号>"
+#    exit 1
+#fi
 
-VERSION=$1
+VERSION=2.1
+sh install.sh
 
-cd /home/pi/
+thispwd=$(pwd)
+#cd /home/pi/
 
 DebDirectory=DebpackTowerSif
 
@@ -29,8 +31,11 @@ Architecture: armhf
 Maintainer: rlx, tc
 Description: test" > control
 
-cd /home/pi/
-sudo dpkg -b $DebDirectory TowerSif_${VERSION}.deb
+#cd /home/pi/
+cd $thispwd
+sudo dpkg -b $DebDirectory TowerSif_V${VERSION}.deb
+mkdir -p DEB
+cp TowerSif_V${VERSION}.deb DEB/
 rm -r $DebDirectory
 
 #sudo dpkg -r TowerSif
diff --git a/install.sh b/install.sh
index e69de29..aacd72a 100644
--- a/install.sh
+++ b/install.sh
@@ -0,0 +1,6 @@
+mkdir -p build
+cd build
+cmake ../
+make -j4
+cd ../othersoft
+sh install.sh
\ No newline at end of file
diff --git a/othersoft/install.sh b/othersoft/install.sh
index 2270c82..3e2c688 100644
--- a/othersoft/install.sh
+++ b/othersoft/install.sh
@@ -1,7 +1,7 @@
 mkdir build
 cd build
 
-mkdir movingliner
+mkdir -p movingliner
 cd movingliner
 cmake ../../movingliner
 make -j4
@@ -11,14 +11,14 @@ echo beging build shuttercali
 
 cd ../
 
-mkdir shuttercali
+mkdir -p shuttercali
 cd shuttercali
 cmake ../../shuttercali/project/LocationCali
 make -j4 
 cp ./shutter_calibrate /home/pi/bin
 
 cd ../
-mkdir TemperatureControler
+mkdir -p TemperatureControler
 cd TemperatureControler
 cmake ../../TemperatureControler/project
 make -j4
@@ -27,7 +27,7 @@ mkdir -p /home/data/Setting
 cp  ../../TemperatureControler/Constant_Temperature_Config.json /home/data/Setting
 cd ../
 
-mkdir console
+mkdir -p console
 cd console
 cmake ../../calibration_console
 make -j4
@@ -44,7 +44,7 @@ cd ../
 cp ./root/Mywathdog.sh /root
 cp ./root/start.sh /root
 chmod +x /root/start.sh
-mkdir /home/data
+mkdir -p /home/data
 cd ../
 rm -rf ./TowerOptoSifAndSpectral
 cd /root/filebrew