Merge pull request #341 from sshambar/fixscripts

Updated pairing and antlr install scripts
This commit is contained in:
ejurgensen 2017-01-21 21:56:39 +01:00 committed by GitHub
commit 91ae0c1ec6
2 changed files with 333 additions and 67 deletions

View File

@ -1,45 +1,241 @@
#!/bin/sh
WORKDIR=~/antlr35.tmp
echo "This script will install antlr 3.5 (and matching libantlr) on your computer."
read -p "Should the script create $WORKDIR and use it for building? [Y/n] " yn
if [ "$yn" = "n" ]; then
exit
fi
mkdir -p $WORKDIR
if [ ! -d $WORKDIR ]; then
echo "Error creating $WORKDIR"
exit
fi
cd $WORKDIR
read -p "Should the script download and build antlr and libantlr3c? [Y/n] " yn
if [ "$yn" = "n" ]; then
exit
# programs
MAKE=${MAKE-make}
DOWNLOAD="wget --no-check-certificate"
ALTDOWNLOAD="curl -LO"
SUDO=sudo
# source
ANTLR_VERSION=3.5
ANTLR3_SOURCE="https://github.com/antlr/website-antlr3/raw/gh-pages/download"
ANTLR3_JAR="antlr-3.5.2-complete.jar"
ANTLR3_URL="$ANTLR3_SOURCE/$ANTLR3_JAR"
LIBANTLR3C="libantlr3c-3.4"
LIBANTLR3C_SOURCE="https://github.com/antlr/website-antlr3/raw/gh-pages/download/C"
LIBANTLR3C_TAR="${LIBANTLR3C}.tar.gz"
LIBANTLR3C_URL="$LIBANTLR3C_SOURCE/$LIBANTLR3C_TAR"
usage() {
echo
echo "This script will download, build and install antlr $ANTLR_VERSION"
echo " (and matching libantlrc) on your computer."
echo
echo "Usage: ${0##*/} -h | [ -p <prefix> ] [ <build-dir> ]"
echo
echo "Parameters:"
echo " -h Show this help"
echo " -p <prefix> Install to prefix (default: choose /usr or /usr/local)"
echo " <build-dir> Build directory (default: $WORKDIR)"
exit 0
}
GIVEN_PREFIX=
case $1 in
-h|--help) usage;;
-p)
shift
[ -n "$1" ] || {
echo "Option -p requires a argument (try -h for usage)"
exit 1
}
GIVEN_PREFIX=$1
shift
;;
-*)
echo "Unrecognized option $1 (try -h for usage)"
exit 1
;;
esac
# override build directory? (support ~ expansion)
[ -n "$1" ] && WORKDIR=$1
ORIG_DIR=`pwd`
err() {
echo "$*"
if [ -n "$FILES_EXIST" ]; then
echo "Files remain in $WORKDIR..."
else
cd "$ORIG_DIR"
rmdir "$WORKDIR"
fi
exit 1
}
is_yes() {
case "$1" in
[N]*|[n]*) return 1;;
*) ;;
esac
return 0
}
prog_install() {
read -p "Would you like to install into $PREFIX now? [Y/n] " yn
if ! is_yes "$yn"; then
echo "Build left ready to install from $WORKDIR"
echo "You can re-run the script (eg. as root) to install into"
echo " $PREFIX later."
exit
fi
if [ `id -u` -ne 0 ]; then
echo "Would you like to install with sudo?"
read -p "NOTE: You WILL be asked for your password! [Y/n] " yn
if ! is_yes "$yn"; then
SUDO=
read -p "Continue to install as non-root user? [Y/n] " yn
is_yes "$yn" || err "Install cancelled"
fi
else
SUDO=
fi
cd $LIBANTLR3C || err "Unable to cd to build libantlr3c build directory!"
echo "Installing libantlr3c to $PREFIX"
$SUDO $MAKE install || err "Install of libantlr3c to $PREFIX failed!"
cd "$ORIG_DIR"
cd $WORKDIR
echo "Installing antlr3 to $PREFIX"
$SUDO mkdir -p "$PREFIX_JAVA" || err "Unable to create $PREFIX_JAVA"
$SUDO install "$ANTLR3_JAR" "$PREFIX_JAVA" || \
err "Failed to install antlr3 jar to $PREFIX_JAVA"
$SUDO install -m 755 antlr3 "$PREFIX/bin" || \
err "Failed to install antlr3 to $PREFIX/bin"
echo "Install complete (build remains in $WORKDIR)"
}
echo "This script will download, build and install antlr $ANTLR_VERSION"
echo " (and matching libantlrc) on your computer."
echo
# check if make works
ISGNU=`$MAKE --version 2>/dev/null | grep "GNU Make"`
if [ -z "$ISGNU" ]; then
MAKE=gmake
ISGNU=`$MAKE --version 2>/dev/null | grep "GNU Make"`
fi
read -p "Should the script install with prefix /usr or /usr/local? [U/l] " yn
if [ "$yn" = "l" ]; then
PREFIX=/usr/local
[ -z "$ISGNU" ] && err "Unable to locate GNU Make, set \$MAKE to it's location and re-run"
if [ -f "$WORKDIR/install_env" ]; then
echo "Existing build found in $WORKDIR"
FILES_EXIST=1
cd $WORKDIR || err "Unable to cd to '$WORKDIR'"
. install_env
[ -n "$PREFIX" ] || err "PREFIX is missing in file 'install_env'"
if [ -n "$GIVEN_PREFIX" ] && [ "$GIVEN_PREFIX" != "$PREFIX" ]; then
echo "You must rebuild to install into $GIVEN_PREFIX (current build for $PREFIX)"
read -p "Would you like to rebuild for ${GIVEN_PREFIX}? [Y/n] " yn
if is_yes "$yn"; then
rm -f install_env
PREFIX=
else
read -p "Would you like to install to ${PREFIX}? [Y/n] " yn
! is_yes "$yn" && err "Install cancelled"
fi
fi
if [ -n "$PREFIX" ]; then
PREFIX_JAVA=$PREFIX/share/java
prog_install
exit 0
fi
fi
if [ ! -d "$WORKDIR" ]; then
read -p "Should the script create $WORKDIR and use it for building? [Y/n] " yn
is_yes "$yn" || exit
fi
if [ -n "$GIVEN_PREFIX" ]; then
PREFIX=$GIVEN_PREFIX
else
PREFIX=/usr
read -p "Should the script install with prefix /usr or /usr/local? [U/l] " yn
if [ "$yn" = "l" ]; then
PREFIX=/usr/local
else
PREFIX=/usr
fi
fi
read -p "Should the script build libantlr3c for 64 bit? [Y/n] " yn
if [ "$yn" != "n" ]; then
ENABLE64BIT="--enable-64bit"
fi
wget --no-check-certificate https://github.com/antlr/website-antlr3/raw/gh-pages/download/antlr-3.5.2-complete.jar
wget --no-check-certificate https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz
tar xzf libantlr3c-3.4.tar.gz
cd libantlr3c-3.4
./configure $ENABLE64BIT --prefix=$PREFIX && make && sudo make install
cd $WORKDIR
PREFIX_JAVA=$PREFIX/share/java
sudo mkdir -p "$PREFIX/share/java"
sudo install antlr-3.5.2-complete.jar "$PREFIX/share/java"
MACHBITS=`getconf LONG_BIT 2>/dev/null`
[ "$MACHBITS" = "64" ] && DEF_AN="[Y/n]" || DEF_AN="[y/N]"
read -p "Should the script build libantlr3c for 64 bit? $DEF_AN " yn
[ -z "$yn" -a "$MACHBITS" != "64" ] && yn=n
is_yes "$yn" && ENABLE64BIT="--enable-64bit"
mkdir -p "$WORKDIR" || err "Error creating $WORKDIR"
# don't quote WORKDIR to catch a WORKDIR that will break the build (eg spaces)
cd $WORKDIR || err "Unable to cd to '$WORKDIR' (does it include spaces?)"
REMOVE_ON_CANCEL=
cancel_download() {
echo "removing $REMOVE_ON_CANCEL"
[ -n "$REMOVE_ON_CANCEL" ] && rm -f "$REMOVE_ON_CANCEL"
err "Cancelling download..."
}
antlr_download() {
trap cancel_download SIGINT
$DOWNLOAD --help >/dev/null 2>&1 || DOWNLOAD=$ALTDOWNLOAD
$DOWNLOAD --help >/dev/null 2>&1 || {
echo "Unable to find wget or curl commands to download source,"
echo " please install either one and re-try."
exit 1
}
[ "x$1" = "xreset" ] && rm "$ANTLR3_JAR" "$LIBANTLR3C_TAR"
if [ ! -f "$ANTLR3_JAR" ]; then
echo
echo "Downloading antlr from $ANTLR3_URL"
echo "Ctrl-C to abort..."
REMOVE_ON_CANCEL=$ANTLR3_JAR
$DOWNLOAD "$ANTLR3_URL" || err "Download of $ANTLR3_JAR failed!"
FILES_EXIST=1
fi
if [ ! -f "$LIBANTLR3C_TAR" ]; then
echo
echo "Downloading libantlr3c from $LIBANTLR3C_URL"
echo "Ctrl-C to abort..."
REMOVE_ON_CANCEL=$LIBANTLR3C_TAR
$DOWNLOAD "$LIBANTLR3C_URL" || err "Download of $LIBANTLR3C_TAR failed!"
FILES_EXIST=1
fi
trap - SIGINT
}
# retrieve the source
if [ -f "$ANTLR3_JAR" -a -f "$LIBANTLR3C_TAR" ]; then
FILES_EXIST=1
read -p "Files appear to already be downloaded, use them? [Y/n] " yn
! is_yes "$yn" && antlr_download reset
else
read -p "Should the script download and build antlr and libantlr3c? [Y/n] " yn
is_yes "$yn" || exit
antlr_download
fi
# build/install libantlr3c
[ -d "$LIBANTLR3C" ] && rm -rf "$LIBANTLR3C"
tar xzf "$LIBANTLR3C_TAR" || err "Uncompress of $LIBANTLR3C_TAR failed!"
cd $LIBANTLR3C || err "Unable to cd to build $LIBANTLR3C build directory!"
./configure $ENABLE64BIT --prefix=$PREFIX && $MAKE
[ $? -ne 0 ] && err "Build of libantlr3c failed!"
# install antlr3 jar and wrapper
cd "$ORIG_DIR"
cd $WORKDIR
printf "#!/bin/sh
export CLASSPATH
CLASSPATH=\$CLASSPATH:$PREFIX/share/java/antlr-3.5.2-complete.jar:$PREFIX/share/java
CLASSPATH=\$CLASSPATH:$PREFIX_JAVA/${ANTLR3_JAR}:$PREFIX_JAVA
/usr/bin/java org.antlr.Tool \$*
" > antlr3
sudo install --mode=755 antlr3 "$PREFIX/bin"
# save for later install attempts
echo "PREFIX=$PREFIX" > install_env
echo
prog_install

View File

@ -1,64 +1,134 @@
#!/bin/sh
# Set location of the config file
conf_path=/etc/forked-daapd.conf
# Default config file
conf_path="/etc/forked-daapd.conf"
if [ ! -f $conf_path ]; then
echo "Error: Couldn't find $conf_path"
echo "Set the correct config file location in the script"
exit
usage() {
echo
echo "Interactive script pair Remote with forked-daapd"
echo
echo "Usage: ${0##*/} -h | [ <config-file> ]"
echo
echo "Parameters:"
echo " -h Show this help"
echo " <config-file> Config file (default: $conf_path)"
echo
echo "NOTE: forked-daapd needs to be running..."
exit 0
}
case $1 in
-h|--help) usage;;
-*)
echo "Unrecognized option $1 (try -h for usage)"
exit 1
;;
esac
[ -n "$1" ] && conf_path=$1
if [ ! -f "$conf_path" ]; then
echo "Couldn't find config file '$conf_path' (try -h for usage)"
exit 1
fi
logfile=`awk '$1=="logfile"{print $3}' $conf_path`
logfile="${logfile%\"}"
logfile="${logfile#\"}"
[ -z "$logfile" ] && logfile="/var/log/forked-daapd.log"
if [ ! -r "$logfile" ]; then
echo "Error: Couldn't read logfile '$logfile'"
echo "Verify 'logfile' setting in config file '$conf_path'"
exit 1
fi
library_path=`awk '$1=="directories"{print}' $conf_path`
library_path="${library_path#*\"}"
library_path="${library_path%%\"*}"
if [ -z "$library_path" ]; then
echo "Couldn't find 'directories' setting in config file '$conf_path'"
exit 1
fi
if [ ! -d "$library_path" ]; then
echo "Error: Couldn't find library '$library_path'"
echo "Verify 'directories' setting in config file '$conf_path'"
exit 1
fi
if [ ! -f $logfile ]; then
echo "Error: Couldn't find logfile in $logfile"
exit
fi
if [ ! -d $library_path ]; then
echo "Error: Couldn't find library in $library_path"
exit
fi
rf="$library_path/pair.remote"
[ -f "$rf" ] && rm -f "$rf"
[ -f "$rf" ] && echo "Unable to remove existing pairing file '$rf'" && exit 1
echo "This script will help you pair Remote with forked-daapd"
echo "Please verify that these paths are correct:"
echo " Log file: $logfile"
echo " Library: $library_path"
echo " Log file: '$logfile'"
echo " Library: '$library_path'"
read -p "Confirm? [Y/n] " yn
if [ "$yn" = "n" ]; then
exit
fi
case "$yn" in
[N]*|[n]*) exit;;
esac
echo "Please start the pairing process in Remote by selecting Add library"
read -p "Press ENTER when ready..." yn
echo -n "Looking in $logfile for Remote announcement..."
sleep 5
printf %s "Looking in $logfile for Remote announcement..."
remote=`grep "Discovered remote" $logfile | tail -1 | grep -Po "'.*' \("`
remote="${remote%\'\ \(}"
remote="${remote#\'}"
n=5
while [ $n -gt 0 ]; do
n=`expr $n - 1`
remote=`tail -50 "$logfile" | grep "Discovered remote" | tail -1 | grep -o "'.*' ("`
remote="${remote%\'\ \(}"
remote="${remote#\'}"
[ -n "$remote" ] && break
sleep 2
done
if [ -z "$remote" ]; then
echo "not found"
exit
else
echo "found"
echo "not found!"
exit 1
fi
echo "found"
read -p "Ready to pair Remote '$remote', please enter PIN: " pin
if [ -z "$pin" ]; then
echo "Error: Invalid PIN"
exit
echo "Error: Invalid PIN"
exit 1
fi
echo "Writing pair.remote to $library_path..."
printf "$remote\n$pin" > "$library_path/pair.remote"
sleep 1
echo "Removing pair.remote from library again..."
rm "$library_path/pair.remote"
echo "All done"
printf "$remote\n$pin" > "$rf"
if [ ! -f "$rf" ]; then
echo "Unable to create '$rf' - check directory permissions"
exit 1
fi
# leave enough time for deferred file processing on BSD
n=20
echo "Waiting for pairing to complete (up to $n secs)..."
while [ $n -gt 0 ]; do
n=`expr $n - 1`
result=`tail -1000 "$logfile" | sed -n "/.*remote:/ s,.*remote: ,,p" | awk '/^Discovered remote/{ f="" } /^Read Remote pairing data/ { f=$0; } END { print f }'`
[ -n "$result" ] && break
sleep 1
done
if [ -z "$result" ]; then
echo "forked-daap doesn't appear to be finding $rf..."
echo "Check $logfile, removing pair.remote"
rm "$rf"
exit 1
fi
echo "Pairing file pair.remote read, removing it"
rm "$rf"
n=5
while [ $n -gt 0 ]; do
n=`expr $n - 1`
result=`tail -1000 "$logfile" | sed -n "/.*remote:/ s,.*remote: ,,p" | awk '/^Discovered remote/{ f="" } /^Pairing succeeded/ { f=$0; } END { print f }'`
if [ -n "$result" ]; then
echo "All done"
exit
fi
sleep 1
done
echo "Pairing appears to have failed... check $rf for details"
exit 1