further qnadmin fixes

pull/12/head
Tom Early 7 years ago
parent 8bc8ad9984
commit 2149e116cc

@ -17,14 +17,14 @@
InstallSystem () { InstallSystem () {
local n local n
if [ -z == ${1} ]; then if [ -z ${1} ]; then
n=$( grep processor /proc/cpuinfo | wc -l ) n=$( grep processor /proc/cpuinfo | wc -l )
echo "Detected $n processors for make" echo "Detected $n processors for make"
make base -j$n make base -j$n
fi fi
sudo make ${1}installbase sudo make ${1}installbase
if [ $ndvap -gt 0 ]; then if [ $ndvap -gt 0 ]; then
if [ -z == ${1} ]; then if [ -z ${1} ]; then
make qndvap -j$n make qndvap -j$n
fi fi
if [ $ndvap -eq 1 ]; then if [ $ndvap -eq 1 ]; then
@ -38,7 +38,7 @@ InstallSystem () {
fi fi
fi fi
if [ $ndvrptr -gt 0 ]; then if [ $ndvrptr -gt 0 ]; then
if [ -z == ${1} ]; then if [ -z ${1} ]; then
make qndvrptr -j$n make qndvrptr -j$n
fi fi
if [ $ndvrptr -eq 1 ]; then if [ $ndvrptr -eq 1 ]; then
@ -52,7 +52,7 @@ InstallSystem () {
fi fi
fi fi
if [ $nitap -gt 0 ]; then if [ $nitap -gt 0 ]; then
if [ -z == ${1} ]; then if [ -z ${1} ]; then
make qnitap -j$n make qnitap -j$n
fi fi
if [ $nitap -eq 1 ]; then if [ $nitap -eq 1 ]; then
@ -66,7 +66,7 @@ InstallSystem () {
fi fi
fi fi
if [ $nmmdvm -gt 0 ]; then if [ $nmmdvm -gt 0 ]; then
if [ -z == ${1} ]; then if [ -z ${1} ]; then
make qnrelay -j$n make qnrelay -j$n
fi fi
if [ $nmmdvm -eq 1 ]; then if [ $nmmdvm -eq 1 ]; then
@ -198,6 +198,7 @@ while [[ "$ans" != q* ]]; do
echo echo
if [[ "$ActiveGate" == "inactive" ]] || [[ "$ActiveLink" == "inactive" ]]; then if [[ "$ActiveGate" == "inactive" ]] || [[ "$ActiveLink" == "inactive" ]]; then
echo "i : Install configured system" echo "i : Install configured system"
echo "u : Uninstall System"
echo "d : Install DTMF" echo "d : Install DTMF"
fi fi
echo "c : Clean (remove temporary files and locally build executibles)" echo "c : Clean (remove temporary files and locally build executibles)"
@ -207,6 +208,8 @@ while [[ "$ans" != q* ]]; do
# EXECUTE COMMANDS # EXECUTE COMMANDS
if [[ "$ans" == i* ]]; then if [[ "$ans" == i* ]]; then
InstallSystem InstallSystem
elif [[ "$ans" == u* ]]; then
InstallSystem un
elif [[ "$ans" == d* ]]; then elif [[ "$ans" == d* ]]; then
sudo make installdtmf sudo make installdtmf
elif [[ "$ans" == c* ]]; then elif [[ "$ans" == c* ]]; then

Loading…
Cancel
Save

Powered by TurnKey Linux.