Formatting updates to OGN and HAB decoders

pull/334/head
Romeo-Golf 2016-12-30 17:42:55 +00:00
rodzic 37d40b118c
commit 4a796ba8ed
1 zmienionych plików z 9 dodań i 7 usunięć

Wyświetl plik

@ -134,9 +134,10 @@ if [[ ! ${PWD} == ${DECODER_BUILD_DIRECTORY} ]] ; then
fi
# Download and compile the required SSDV library.
DECODER_GITHUB_URL_SSDV="//github.com/fsphil/ssdv.git"
DECODER_GITHUB_URL_SSDV="https://github.com/fsphil/ssdv.git"
DECODER_GITHUB_URL_SSDV_SHORT=`echo ${DECODER_GITHUB_URL_SSDV} | sed -e 's/http:\/\///g' -e 's/https:\/\///g'`
if [[ -d ${DECODER_BUILD_DIRECTORY}/ssdv ]] ; then
echo -en "\e[33m Updating SSDV library from \"\e[37m${DECODER_GITHUB_URL_SSDV}\e[33m\"...\t\t\t\t\t"
echo -en "\e[33m Updating SSDV library from \"\e[37m${DECODER_GITHUB_URL_SSDV_SHORT}\e[33m\"...\t"
cd ${DECODER_BUILD_DIRECTORY}/ssdv
git remote update > /dev/null 2>&1
if [[ `git status -uno | grep -c "is behind"` -gt 0 ]] ; then
@ -145,9 +146,9 @@ if [[ -d ${DECODER_BUILD_DIRECTORY}/ssdv ]] ; then
sudo make install
fi
else
echo -en "\e[33m Cloning SSDV library from \"\e[37m${DECODER_GITHUB_URL_SSDV}\e[33m\"...\t\t\t\t\t"
echo -en "\e[33m Cloning SSDV library from \"\e[37m${DECODER_GITHUB_URL_SSDV_SHORT}\e[33m\"...\t"
cd ${DECODER_BUILD_DIRECTORY}
git clone ${DECODER_GITHUB_URL_SSDV}
git clone https://${DECODER_GITHUB_URL_SSDV_SHORT}
cd ${DECODER_BUILD_DIRECTORY}/ssdv
sudo make install
fi
@ -155,8 +156,9 @@ CheckReturnCode
# Download and compile the decoder itself.
DECODER_GITHUB_URL_LORA_GATEWAY="https://github.com/PiInTheSky/lora-gateway.git"
DECODER_GITHUB_URL_LORA_GATEWAY_SHORT=`echo ${DECODER_GITHUB_URL_LORA_GATEWAY} | sed -e 's/http:\/\///g' -e 's/https:\/\///g'`
if [[ -d ${DECODER_BUILD_DIRECTORY}/lora-gateway ]] ; then
echo -en "\e[33m Updating ${DECODER_NAME} from \"\e[37m${DECODER_GITHUB_URL_LORA_GATEWAY}\e[33m\"...\t\t\t\t"
echo -en "\e[33m Updating ${DECODER_NAME} from \"\e[37m${DECODER_GITHUB_URL_LORA_GATEWAY_SHORT}\e[33m\"...\t"
cd ${DECODER_BUILD_DIRECTORY}/lora-gateway
git remote update > /dev/null 2>&1
if [[ `git status -uno | grep -c "is behind"` -gt 0 ]] ; then
@ -165,9 +167,9 @@ if [[ -d ${DECODER_BUILD_DIRECTORY}/lora-gateway ]] ; then
make
fi
else
echo -en "\e[33m Cloning ${DECODER_NAME} from \"\e[37m${DECODER_GITHUB_URL_LORA_GATEWAY}\e[33m\"...\t\t\t\t"
echo -en "\e[33m Cloning ${DECODER_NAME} from \"\e[37m${DECODER_GITHUB_URL_LORA_GATEWAY_SHORT}\e[33m\"...\t"
cd ${DECODER_BUILD_DIRECTORY}
git clone ${DECODER_GITHUB_URL_LORA_GATEWAY}
git clone https://${DECODER_GITHUB_URL_LORA_GATEWAY_SHORT}
cd ${DECODER_BUILD_DIRECTORY}/lora-gateway
make
fi