Parcourir la source

updating deploy script

* adding some more messages to 'apply_update.sh' script
Abram Connelly il y a 6 ans
Parent
commit
ec4220ff8b
2 fichiers modifiés avec 11 ajouts et 2 suppressions
  1. 9 2
      aux/deploy-busunit-interactive
  2. 2 0
      busunit/scripts/apply_update.sh

+ 9 - 2
aux/deploy-busunit-interactive

@@ -185,9 +185,14 @@ sudo bash -c " cd /home/bus/bin ; ln -s $bd/DIUv2/diu_kiosk . "
 sudo bash -c " cd /home/bus/bin ; ln -s $bd/scripts/init_bus.sh . ; ln -s $bd/scripts/update_loop.sh . ; ln -s $bd/scripts/setup-serial.py . ; ln -s $bd/scripts/get_net_ids.sh . "
 sudo bash -c " cd /home/bus/bin ; ln -s $bd/scripts/connection_tether.sh . ; ln -s $bd/scripts/reset-gps.py ./reset-gps "
 
+sudo bash -c " cd /home/bus/bin ; ln -s $bd/scripts/apply_update.sh . ; ln -s $bd/scripts/apply_update_legacy.sh . ; ln -s $bd/scripts/apply_update_popufare.sh "
+sudo bash -c " cd /home/bus/bin ; ln -s $bd/scripts/fix_pkg_perm.sh . "
+
 sudo bash -c " cd /home/bus/config ; ln -s $diudir/html . ; "
-sudo bash -c " cd /home/bus/config ; cp $bd/passdb/init.scm . ; cp $bd/passdb/rfid_patterns.txt . "
-sudo bash -c " cp $tc/equipnum.txt . ; cp $tc/config.tgz.checksum . ; cp $tc/config.tgz.version . ; cp $tc/firmware.tgz.checksum . ; cp $tc/firmware.tgz.version . ; cp $tc/serial.txt serial_num "
+sudo bash -c " cd /home/bus/config ; cp $bd/passdb/init.scm . ; cp $bd/passdb/rfid_patterns.txt . ; cp $bd/avls/avls_freq.txt . "
+sudo bash -c " cd /home/bus/config ; cp $bd/passdb/init.scm . ; cp $bd/passdb/rfid_patterns.txt . ; cp $bd/avls/avls_freq.txt . "
+
+sudo bash -c " cd /home/bus/config ; cp $tc/equipnum.txt . ; cp $tc/serial.txt serial_num "
 
 sudo bash -c " rm -f /home/bus/bin/common_values.sh ; cp $bd/scripts/common_values.sh /home/bus/bin "
 
@@ -198,6 +203,8 @@ sudo cp /home/bus/popufare/busunit/testing/config/config.tgz.checksum /home/bus/
 sudo cp /home/bus/popufare/busunit/testing/config/config.tgz.version /home/bus/config/config.tgz.version
 sudo cp /home/bus/popufare/busunit/testing/config/firmware.tgz.checksum /home/bus/config/firmware.tgz.checksum
 sudo cp /home/bus/popufare/busunit/testing/config/firmware.tgz.version /home/bus/config/firmware.tgz.version
+sudo cp /home/bus/popufare/busunit/testing/config/package.tgz.checksum /home/bus/config/package.tgz.checksum
+sudo cp /home/bus/popufare/busunit/testing/config/package.tgz.version /home/bus/config/package.tgz.version
 
 sudo mkdir -p /home/bus/config/server
 

+ 2 - 0
busunit/scripts/apply_update.sh

@@ -28,7 +28,9 @@ server_path="$4"
 file_version="$5"
 
 if tar -tf $update_file popufare.witness > /dev/null 2>&1 ; then
+  echo "apply_update.sh: Found popufare.witness in $update_file, assuming a Popufare installation tarball..."
   /home/bus/bin/apply_update_popufare.sh $update_file $update_checksum $file_size $server_path $file_version
 else
+  echo "apply_update.sh: Could not find popufare.witness in $update_file, assuming a legacy install..."
   /home/bus/bin/apply_update_legacy.sh $update_file $update_checksum $file_size $server_path $file_version
 fi