diff --git a/bin/all-update.sh b/bin/all-update.sh index e98c79a..145a835 100755 --- a/bin/all-update.sh +++ b/bin/all-update.sh @@ -58,21 +58,16 @@ function do_dir { for i in ProbeStar NTCNA CAMP Gits External do - if [ -L "$i" ]; then - echo "$i: Symlinked" - echo "=============" - elif [ -d "$i" ]; then - if [ "$i" == "ProbeStar" ]; then - $HOME/bin/pstar-update.sh - else - d=`echo "${i,,}"` - if [ -f $HOME/bin/$d-update.sh ]; then - $HOME/bin/$d-update.sh - elif [ -d $i ]; then - cd $i - do_dir $i - cd .. - fi + if [ "$i" == "ProbeStar" ]; then + $HOME/bin/pstar-update.sh + else + d=`echo "${i,,}"` + if [ -f $HOME/bin/$d-update.sh ]; then + $HOME/bin/$d-update.sh + elif [ -d $i ]; then + cd $i + do_dir $i + cd .. fi fi done diff --git a/bin/camp-update.sh b/bin/camp-update.sh index 25e348f..d206455 100755 --- a/bin/camp-update.sh +++ b/bin/camp-update.sh @@ -1,9 +1,5 @@ #!/bin/bash -if [ ! -d $HOME/CAMP ]; then - exit 1 -fi - function do_git { echo $1 "(Git)" cd $1 diff --git a/bin/python-updates.sh b/bin/python-updates.sh index 4d0d47d..6796843 100755 --- a/bin/python-updates.sh +++ b/bin/python-updates.sh @@ -1,7 +1,7 @@ #!/bin/sh # Pip -sudo -H pip3 install --upgrade pip +pip3 install --upgrade pip # Python3 -sudo -H pip3 install --upgrade pyserial numpy pyasn1 scapy virtualenv virtualenvwrapper matplotlib +pip3 install --upgrade pyserial numpy pyasn1 scapy virtualenv virtualenvwrapper matplotlib diff --git a/dot/bashrc b/dot/bashrc index 181866d..fbf617d 100644 --- a/dot/bashrc +++ b/dot/bashrc @@ -21,7 +21,7 @@ fi if [ -f /opt/ros/noetic/setup.bash ]; then # 20.04 source /opt/ros/noetic/setup.bash - PYTHONPATH=$PYTHONPATH:$HOME/catkin_ws/devel/lib/python3/dist-packages + export PYTHONPATH=$PYTHONPATH:$HOME/catkin_ws/devel/lib/python3/dist-packages elif [ -f /opt/ros/melodic/setup.bash ]; then # 16.04/18.04 source /opt/ros/melodic/setup.bash