Fix issues with docker and sources

dockerfiles/DevenvMelodic.Dockerfile

@@ -206,6 +206,7 @@ RUN chmod a+x /ros_entrypoint.sh
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["zsh"]
+ENV SHELL /usr/bin/zsh
 
 # Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=

dotfiles/ros.bash

@@ -2,9 +2,9 @@
 # ROS
 ###################################################################
 
-export ROS_DISTRO=noetic
+if [ -z $ROS_DISTRO ]; then export ROS_DISTRO=noetic; fi
 
-ext=$(basename ${SHELL})
+if [ -z $SHELL ]; then echo "SHELL not set"; else ext=$(basename ${SHELL}); fi
 
 # Source rosmon
 function smon(){
@@ -39,6 +39,7 @@ FILE=${WS_path}/devel/setup.${ext}
 if [[ -f $FILE ]]; then
   cd ${WS_path}
   source $FILE
-   smon
   cd ${pwd_bck}
+else
+  source /opt/ros/${ROS_DISTRO}/setup.${ext}
 fi

dotfiles/system.bash

+
+if command -v lsd &> /dev/null
+then
     # Directories
     alias ll='lsd -lh --group-dirs=first'
     alias la='lsd -a --group-dirs=first'
     alias l='lsd --group-dirs=first'
     alias lla='lsd -lha --group-dirs=first'
     alias ls='lsd --group-dirs=first'
+fi
+
+if command -v bat &> /dev/null
+then
     # Files
     alias cat='bat'
+fi
+
 # Python
 alias ipy='ipython'
\ No newline at end of file