Remove ^M

.jenkins.sh

-#!/bin/bash
-# Copyright ETSI 2018
-# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
-
-#set -vx
-set -e
-
-cd "${dirname "$0"}"
-
-run_dir="$(pwd)"
-
-cd docker
-
-./build-container.sh
-./run-container.sh "${run_dir}"
+#!/bin/bash
+# Copyright ETSI 2018
+# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
+
+#set -vx
+set -e
+
+cd $(dirname $0)
+
+run_dir=`pwd`
+
+cd docker
+
+./build-container.sh
+./run-container.sh $run_dir

Vagrant/provisioner.bash

@@ -135,6 +135,9 @@ if [ ${USERNAME} != '' ] && [ ${PASSWORD} != '' ]
 then
     cd ${HOME}/tmp
     svn co --username $USERNAME --password $PASSWORD --non-interactive https://oldforge.vagrant.org/svn/ITS/branches/STF525
+else
+    echo "Pease set <username> & <password> in your local Vagrantfile"
+    exit -1
 fi
 
 sudo echo "" >> /etc/profile 

docker/run-container.sh

@@ -5,7 +5,7 @@
 #set -e
 #set -vx
 
-docker run -it --rm stf525_its:latest /bin/bash -c "sudo stf525"
+docker run -it --rm stf525_its:latest /bin/bash #-c "sudo etsi"
 
 # That's all Floks
 exit 0

scripts/devenv.bash.ubuntu

-#!/bin/bash
-
-# Turn on debug mode
-#set -vx
-
-set -e
-
-# Colors and Prompt
-#export PS1="\w\$ "
-#export PS1="\D{%Y-%m-%d %H:%M:%S} \w\n\$ "
-
-export EDITOR=emacs
-set -o emacs
-
-# Home working directories
-export HOME_FRAMEWORKS=${HOME}/frameworks
-export HOME_LIB=${HOME}/lib
-export HOME_BIN=${HOME}/bin
-export HOME_ETC=${HOME}/etc
-export HOME_TMP=${HOME}/tmp
-export HOME_DOCS=${HOME}/docs
-
-# Home common include directory
-export HOME_INC=${HOME}/include
-
-# Update PATH environment variable
-export PATH=${HOME_BIN}:${PATH}
-
-# Update LD_LIBRARY_PATH environment variable
-if [ "${LD_LIBRARY_PATH}" == "" ]
-then
-    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib
-else 
-    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${LD_LIBRARY_PATH}
-fi
-
-
-# Add JAVA support
-export JAVA_VERSION=1.8.0_92
-export JAVA_JDK=jdk${JAVA_VERSION}
-if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]
-then
-    export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin
-else
-    unset JAVA_VERSION
-    unset JAVA_JDK
-fi
-
-# Add TITAN support
-export TOP=${HOME_FRAMEWORKS}/titan/titan.core
-export TTCN3_DIR=${TOP}/Install
-if [ -d ${TTCN3_DIR} ]
-then
-    export TTCN3_BROWSER=mozilla
-    export PATH=${TTCN3_DIR}/bin:${PATH}
-    export LD_LIBRARY_PATH=${TTCN3_DIR}/lib:${LD_LIBRARY_PATH}
-    export MANPATH=${TTCN3_DIR}/man:${MANPATH}
-    export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat
-    export PATH_DEV_TTCN=${HOME}/dev/ttcn3
-    # ITS support
-    export PATH_DEV_ITS=${HOME}/TriesAndDelete/etsi_its
-    # Emergency Communication support
-    export PATH_DEV_EMCOM=${HOME}/TriesAndDelete/etsi_emcom
-fi
-
-export BROWSER=netsurf
+#!/bin/bash
+
+# Turn on debug mode
+#set -vx
+
+set -e
+
+# Colors and Prompt
+#export PS1="\w\$ "
+#export PS1="\D{%Y-%m-%d %H:%M:%S} \w\n\$ "
+
+export EDITOR=emacs
+set -o emacs
+
+# Home working directories
+export HOME_FRAMEWORKS=${HOME}/frameworks
+export HOME_LIB=${HOME}/lib
+export HOME_BIN=${HOME}/bin
+export HOME_ETC=${HOME}/etc
+export HOME_TMP=${HOME}/tmp
+export HOME_DOCS=${HOME}/docs
+
+# Home common include directory
+export HOME_INC=${HOME}/include
+
+# Update PATH environment variable
+export PATH=${HOME_BIN}:${PATH}
+
+# Update LD_LIBRARY_PATH environment variable
+if [ "${LD_LIBRARY_PATH}" == "" ]
+then
+    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib
+else 
+    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${LD_LIBRARY_PATH}
+fi
+
+
+# Add JAVA support
+export JAVA_VERSION=1.8.0_92
+export JAVA_JDK=jdk${JAVA_VERSION}
+if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]
+then
+    export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin
+else
+    unset JAVA_VERSION
+    unset JAVA_JDK
+fi
+
+# Add TITAN support
+export TOP=${HOME_FRAMEWORKS}/titan/titan.core
+export TTCN3_DIR=${TOP}/Install
+if [ -d ${TTCN3_DIR} ]
+then
+    export TTCN3_BROWSER=mozilla
+    export PATH=${TTCN3_DIR}/bin:${PATH}
+    export LD_LIBRARY_PATH=${TTCN3_DIR}/lib:${LD_LIBRARY_PATH}
+    export MANPATH=${TTCN3_DIR}/man:${MANPATH}
+    export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat
+    export PATH_DEV_TTCN=${HOME}/dev/ttcn3
+    # ITS support
+    export PATH_DEV_ITS=${HOME}/TriesAndDelete/etsi_its
+    # Emergency Communication support
+    export PATH_DEV_EMCOM=${HOME}/TriesAndDelete/etsi_emcom
+fi
+
+export BROWSER=netsurf