Просмотр исходного кода

优化修改相关文件, 使其能够兼容2.0之前的版本升级

niujiuru 8 месяцев назад
Родитель
Сommit
7e002107c0
4 измененных файлов с 8 добавлено и 7 удалено
  1. 2 2
      main.go
  2. 4 3
      package/armv7hf.sh
  3. 1 1
      reporter/reporter.go
  4. 1 1
      scripts/set_env

+ 2 - 2
main.go

@@ -38,8 +38,8 @@ echo 100 > /proc/sys/vm/dirty_writeback_centisecs
 echo 100 > /proc/sys/vm/dirty_expire_centisecs
 
 #启动运行程序
-/home/root/rtu_sy_1a/script/stop
-/home/root/rtu_sy_1a/script/start
+/home/root/rtu_bxs_seyou/script/stop
+/home/root/rtu_bxs_seyou/script/start
 
 exit 0
 `

+ 4 - 3
package/armv7hf.sh

@@ -9,7 +9,8 @@ cur_dir="$(pwd)"
 pre_dir="$(dirname "$cur_dir")"
 RTU_LINUX_MODULES_PATH="${pre_dir}/../rtu_linux_modules"
 
-pkgname="rtu_sy_1a"
+pkgname="rtu_bxs_seyou"
+appname="rtu_sy_1a.out"
 pkg_dir="${cur_dir}/${pkgname}"
 pkg_tar="${cur_dir}/${pkgname}_${ver_num}.tar.gz"
 
@@ -53,11 +54,11 @@ cd ${pre_dir}
 make -C "${pre_dir}" clean
 make -C "${pre_dir}" target=armv7hf
 cd ${cur_dir}
-cp -rf "${pre_dir}/${pkgname}.out" "${pkg_dir}/"
+cp -rf "${pre_dir}/${appname}" "${pkg_dir}/"
 make -C "${pre_dir}" clean
 
 echo "7, Packaging into ${pkg_tar}..."
-tar -czvf "${pkg_tar}" -C "${cur_dir}" "${pkg_dir##*/}"
+tar -czvf "${pkg_tar}" -C "${pkg_dir}" .
 
 # 清理临时目录
 rm -rf "${pkg_dir}"

+ 1 - 1
reporter/reporter.go

@@ -486,7 +486,7 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 				return
 			}
 
-			cmdStr := "tar xzf " + lf + " -C " + filepath.Dir(baseapp.EXEC_DIR)
+			cmdStr := "tar xzf " + lf + " -C " + baseapp.EXEC_DIR
 			cmd := exec.Command("sh", "-c", cmdStr)
 			cmd.Stdout = baseapp.Logger.WriterLevel(logrus.DebugLevel)
 			cmd.Stderr = baseapp.Logger.WriterLevel(logrus.ErrorLevel)

+ 1 - 1
scripts/set_env

@@ -1,4 +1,4 @@
-export APPHOME_PATH="/home/root/rtu_sy_1a"
+export APPHOME_PATH="/home/root/rtu_bxs_seyou"
 export APPBINS_PATH="${APPHOME_PATH}"
 export APPLIBS_PATH="${APPHOME_PATH}/lib"
 export APPRUNS_PATH="${APPHOME_PATH}/status"