From 0de68d238725faf3edf6f74e202c612438648606 Mon Sep 17 00:00:00 2001 From: Thanassis Tsiodras Date: Tue, 21 Feb 2017 17:01:38 +0100 Subject: [PATCH] Don't emit the binary path when adding to PATH --- install/05-antlr.sh | 2 +- install/10_dmt.sh | 2 +- install/15_asn1scc.sh | 2 +- install/20_msc.sh | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/install/05-antlr.sh b/install/05-antlr.sh index 2d87fe3..7185126 100755 --- a/install/05-antlr.sh +++ b/install/05-antlr.sh @@ -8,4 +8,4 @@ pip2 install --user --upgrade . || exit 1 # Add .local/bin to PATH PATH_CMD='export PATH=$PATH:$HOME/.local/bin' -grep "${PATH_CMD}" ${TASTE_PATHS} || echo "${PATH_CMD}" >> ${TASTE_PATHS} +grep "${PATH_CMD}" ${TASTE_PATHS} >/dev/null || echo "${PATH_CMD}" >> ${TASTE_PATHS} diff --git a/install/10_dmt.sh b/install/10_dmt.sh index 8f7a44b..e028c21 100755 --- a/install/10_dmt.sh +++ b/install/10_dmt.sh @@ -8,4 +8,4 @@ pip3 install --user --upgrade . || exit 1 # Add .local/bin to PATH PATH_CMD='export PATH=$PATH:$HOME/.local/bin' -grep "${PATH_CMD}" ${TASTE_PATHS} || echo "${PATH_CMD}" >> ${TASTE_PATHS} +grep "${PATH_CMD}" ${TASTE_PATHS} >/dev/null || echo "${PATH_CMD}" >> ${TASTE_PATHS} diff --git a/install/15_asn1scc.sh b/install/15_asn1scc.sh index 8970e39..904a0c5 100755 --- a/install/15_asn1scc.sh +++ b/install/15_asn1scc.sh @@ -9,4 +9,4 @@ wget -q -O - https://github.com/ttsiodras/asn1scc/releases/download/3.3.9/asn1sc # Add ~/tool-inst/share/asn1scc/ to PATH PATH_CMD='export PATH=$PATH:$HOME/tool-inst/share/asn1scc/' -grep "${PATH_CMD}" ${TASTE_PATHS} || echo "${PATH_CMD}" >> ${TASTE_PATHS} +grep "${PATH_CMD}" ${TASTE_PATHS} >/dev/null || echo "${PATH_CMD}" >> ${TASTE_PATHS} diff --git a/install/20_msc.sh b/install/20_msc.sh index b459b8a..333a3a6 100755 --- a/install/20_msc.sh +++ b/install/20_msc.sh @@ -1,6 +1,11 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# Build MSC tools cd $DIR/../taste-MSC/ || exit 1 make || exit 1 cp ./MSC-Antlr3/bin/msc2py.exe $HOME/.local/bin || exit 1 cp ./MSC-Antlr3/bin/taste-extract-asn-from-design.exe $HOME/.local/bin || exit 1 + +PATH_CMD='export PATH=$PATH:$HOME/.local/bin' +grep "${PATH_CMD}" ${TASTE_PATHS} >/dev/null || echo "${PATH_CMD}" >> ${TASTE_PATHS} -- GitLab