removed catkin_init_workspace as it is not needed (#809)

* removed catkin_init_workspace as it causes errors if init has already happened * moved hardware system driver installers to their own dir * changed path for blueview driver in CI * Changed hardcoded paths in the installers Co-authored-by: Alex Perez <[email protected]> Co-authored-by: cameron brown <[email protected]>
uf-mil · Sep 25, 2022 · 28cf329 · 28cf329
1 parent 12a6fa0
commit 28cf329
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -55,7 +55,7 @@ jobs:
       - name: Install BlueView Sonar SDK
         run: |
           cd $GITHUB_WORKSPACE/catkin_ws/src/mil
-          ./scripts/install_bvtsdk --pass ${{ secrets.ZOBELISK_PASSWORD }}
+          ./scripts/hardware_installers/install_bvtsdk --pass ${{ secrets.ZOBELISK_PASSWORD }}
           ls mil_common/drivers/mil_blueview_driver
           echo $PWD
       - name: Run catkin_make

diff --git a/scripts/install_bvtsdk → scripts/hardware_installers/install_bvtsdk b/scripts/install_bvtsdk → scripts/hardware_installers/install_bvtsdk
@@ -2,8 +2,8 @@
 # Script to decrypt and untar blueview sdk for use in mil_blueview_driver
 set -euo pipefail
 
-BVTSDK=$(realpath $(dirname $BASH_SOURCE)/../proprietary/libbvtsdk.tar.gz.enc)
-DESTINATION=$(realpath $(dirname $BASH_SOURCE)/../mil_common/drivers/mil_blueview_driver)
+BVTSDK=$(realpath $(dirname $BASH_SOURCE)/../../proprietary/libbvtsdk.tar.gz.enc)
+DESTINATION=$(realpath $(dirname $BASH_SOURCE)/../../mil_common/drivers/mil_blueview_driver)
 PASS=""
 
 echo "Enter proprietary software password to decrypt BlueView Sonar SDK."

diff --git a/scripts/install_flycap → scripts/hardware_installers/install_flycap b/scripts/install_flycap → scripts/hardware_installers/install_flycap
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Path to encrypted, tared flycapture sdk
-FLYCAP=$(realpath $(dirname $BASH_SOURCE)/../proprietary/flycapture-latest-amd64.tar.gz.enc)
+FLYCAP=$(realpath $(dirname $BASH_SOURCE)/../../proprietary/flycapture-latest-amd64.tar.gz.enc)
 # Random tmp directory to unpack to to instlal
 UNPACK_DIR=$(mktemp -d)
 

diff --git a/scripts/install_sylphase_sonar → ...ardware_installers/install_sylphase_sonar b/scripts/install_sylphase_sonar → ...ardware_installers/install_sylphase_sonar
diff --git a/scripts/install_udev_rules → ...ts/hardware_installers/install_udev_rules b/scripts/install_udev_rules → ...ts/hardware_installers/install_udev_rules
@@ -12,7 +12,7 @@ sudo usermod -a -G dialout "$USER"
 # Make udev rules directory if it doesn't exist
 sudo mkdir -p /etc/udev/rules.d
 # Copy rules file from repo to udev config
-sudo cp $(realpath $(dirname $BASH_SOURCE)/../provisioning/99-mil.rules) /etc/udev/rules.d/
+sudo cp $(realpath $(dirname $BASH_SOURCE)/../../provisioning/99-mil.rules) /etc/udev/rules.d/
 # Reload udev rules so they take effect
 sudo udevadm control --reload-rules
 

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -277,10 +277,10 @@ mil_user_setup_rc()
 
 # Sets up the catkin workspace so that user can build
 # If the repo is already cloned here, it will build the MIL code
+# catkin_init_workspace is superfluous, catkin_make is all you need
 mil_user_setup_init_catkin()
 {
   mkdir -p $CATKIN_SOURCE_DIR
-  catkin_init_workspace $CATKIN_SOURCE_DIR
   catkin_make -C $CATKIN_DIR
 }