Skip to content

Commit 9b7d7f3

Browse files
author
ron.record
committed
Cleanup unattended install, emphasize discover message
1 parent a4d9d4c commit 9b7d7f3

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

Install

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ else
3636
}
3737
fi
3838

39-
[ "$1" == "unattended" ] && export ROON_UNATTENDED="unattended"
39+
[ "$1" == "unattended" ] && {
40+
export ROON_UNATTENDED="unattended"
41+
shift
42+
}
4043

4144
[ "${iamroot}" ] && {
4245
[ "${ROON_UNATTENDED}" ] || {

etc/postinstall

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if [ "${PYTHONUSERBASE}" ]; then
240240
fi
241241
. ${ROONCONF}
242242

243-
RVER=$(${PYTHON} -m pip show roonapi | grep Version | awk -F ':' ' { print $2 } ')
243+
RVER=$(${PYTHON} -m pip show roonapi 2>/dev/null | grep Version | awk -F ':' ' { print $2 } ')
244244
# Remove leading and trailing spaces in RVER
245245
RVER="$(echo -e "${RVER}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
246246
# Only patch Roonapi version 0.0.38 and earlier
@@ -309,16 +309,20 @@ else
309309
fi
310310

311311
# Install utilities used by the RoonCommandLine menu system
312-
[ -x ${ROON}/etc/install-figlet ] && ${SUDO} ${SARG} ${SUSR} ${ROON}/etc/install-figlet
313-
[ -x ${ROON}/etc/install-fzf ] && ${SUDO} ${SARG} ${SUSR} ${ROON}/etc/install-fzf
314-
[ -x ${ROON}/etc/install-gum ] && ${SUDO} ${SARG} ${SUSR} ${ROON}/etc/install-gum
312+
[ -x ${ROON}/etc/install-figlet ] && ${SUDO} ${SARG} ${SUSR} ${ROON}/etc/install-figlet 2>/dev/null
313+
[ -x ${ROON}/etc/install-fzf ] && ${SUDO} ${SARG} ${SUSR} ${ROON}/etc/install-fzf 2>/dev/null
314+
[ -x ${ROON}/etc/install-gum ] && ${SUDO} ${SARG} ${SUSR} ${ROON}/etc/install-gum 2>/dev/null
315315

316316
echo ""
317317
if [ "${ROON_UNATTENDED}" ]; then
318+
echo ""
319+
echo "*************************** IMPORTANT ***************************"
318320
echo "Roon Core discovery and authorizing the RoonCommandLine extension"
319321
echo "must be performed post-installation in unattended installations."
320322
echo "After the installation of RoonCommandLine completes, run the command:"
323+
echo ""
321324
echo " /usr/local/bin/roon -c discover"
325+
echo "*****************************************************************"
322326
else
323327
${ROON}/etc/discover "${SUDO}" "${SARG}" "${SUSR}"
324328
fi

linInstall

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ else
2929
}
3030
fi
3131

32-
[ "$1" == "unattended" ] && export ROON_UNATTENDED="unattended"
32+
[ "$1" == "unattended" ] && {
33+
export ROON_UNATTENDED="unattended"
34+
shift
35+
}
3336

3437
BOLD=$(tput bold 2>/dev/null)
3538
NORMAL=$(tput sgr0 2>/dev/null)
@@ -417,10 +420,14 @@ fi
417420

418421
echo ""
419422
if [ "${ROON_UNATTENDED}" ]; then
423+
echo ""
424+
echo "*************************** IMPORTANT ***************************"
420425
echo "Roon Core discovery and authorizing the RoonCommandLine extension"
421426
echo "must be performed post-installation in unattended installations."
422427
echo "After the installation of RoonCommandLine completes, run the command:"
428+
echo ""
423429
echo " /usr/local/bin/roon -c discover"
430+
echo "*****************************************************************"
424431
else
425432
${ROON}/etc/discover "${SUDO}" "${SARG}" "${SUSR}"
426433
fi

macInstall

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ else
2727
}
2828
fi
2929

30-
[ "$1" == "unattended" ] && export ROON_UNATTENDED="unattended"
30+
[ "$1" == "unattended" ] && {
31+
export ROON_UNATTENDED="unattended"
32+
shift
33+
}
3134

3235
BOLD=$(tput bold 2>/dev/null)
3336
NORMAL=$(tput sgr0 2>/dev/null)
@@ -445,10 +448,14 @@ fi
445448

446449
echo ""
447450
if [ "${ROON_UNATTENDED}" ]; then
451+
echo ""
452+
echo "*************************** IMPORTANT ***************************"
448453
echo "Roon Core discovery and authorizing the RoonCommandLine extension"
449454
echo "must be performed post-installation in unattended installations."
450455
echo "After the installation of RoonCommandLine completes, run the command:"
456+
echo ""
451457
echo " /usr/local/bin/roon -c discover"
458+
echo "*****************************************************************"
452459
else
453460
${ROON}/etc/discover "${SUDO}" "${SARG}" "${SUSR}"
454461
fi

0 commit comments

Comments
 (0)