Skip to content
Permalink
Browse files

Fix Git issue

  • Loading branch information...
NEMS Linux
NEMS Linux committed Jul 30, 2019
1 parent fac6fd6 commit 420627aab86e679f22bb51faa7832d7b3d9744a2
Showing with 0 additions and 7 deletions.
  1. +0 −4 fixes.sh
  2. +0 −3 info2.sh
@@ -308,20 +308,16 @@ fi

if (( $(awk 'BEGIN {print ("'$ver'" >= "'1.5'")}') )); then

<<<<<<< HEAD
# Install TEMPer Support
if [ $(dpkg-query -W -f='${Status}' python3-serial 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
/root/nems/nems-admin/build/500-temper
fi


=======
# Install nems-webhooktest command if not already
if [ ! -f /usr/local/bin/nems-webhooktest ]; then
ln -s /usr/local/share/nems/nems-scripts/webhooktest.sh /usr/local/bin/nems-webhooktest
fi

>>>>>>> 0ba038738ba33e33ca95cec6dc57e7a20f7cbfe3
# Move NEMS TV Dashboard out of nems-www
if [[ ! -d /var/www/nems-tv ]]; then
cd /var/www
@@ -444,16 +444,13 @@ EOQ;
break;
<<<<<<< HEAD
case 12:
while (stristr($temper = shell_exec('/usr/local/share/nems/nems-scripts/temper.py --json'),'error')) {
}
print_r($temper);
break;
=======
>>>>>>> 0ba038738ba33e33ca95cec6dc57e7a20f7cbfe3
}

0 comments on commit 420627a

Please sign in to comment.
You can’t perform that action at this time.