mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Commits from @MartB and more ...
- Commit: 1d9165f403
- New default QT capture implementation
- UploadHandler added to Effects Configurator to allow uploading GIF files
- Docker compile script and instruction
- Travis Fix
This commit is contained in:
Paulchen-Panther
112
bin/scripts/docker-compile.sh
Normal file
112
bin/scripts/docker-compile.sh
Normal file
@@ -0,0 +1,112 @@
|
||||
#!/bin/bash -e
|
||||
|
||||
DOCKER="docker"
|
||||
# Git repo url of Hyperion
|
||||
GIT_REPO_URL="https://github.com/hyperion-project/hyperion.ng.git"
|
||||
# cmake build type
|
||||
BUILD_TYPE="Release"
|
||||
# the image tag at hyperionorg/hyperion-ci
|
||||
BUILD_TARGET="ubuntu1604"
|
||||
# build packages (.deb .zip ...)
|
||||
BUILD_PACKAGES=true
|
||||
# packages string inserted to cmake cmd
|
||||
PACKAGES=""
|
||||
|
||||
# get current path to this script, independent of calling
|
||||
pushd . > /dev/null
|
||||
SCRIPT_PATH="${BASH_SOURCE[0]}"
|
||||
if ([ -h "${SCRIPT_PATH}" ]); then
|
||||
while([ -h "${SCRIPT_PATH}" ]); do cd `dirname "$SCRIPT_PATH"`;
|
||||
SCRIPT_PATH=`readlink "${SCRIPT_PATH}"`; done
|
||||
fi
|
||||
cd `dirname ${SCRIPT_PATH}` > /dev/null
|
||||
SCRIPT_PATH=`pwd`;
|
||||
popd > /dev/null
|
||||
|
||||
set +e
|
||||
$DOCKER ps >/dev/null 2>&1
|
||||
if [ $? != 0 ]; then
|
||||
DOCKER="sudo docker"
|
||||
fi
|
||||
# check if docker is available
|
||||
if ! $DOCKER ps >/dev/null; then
|
||||
echo "Error connecting to docker:"
|
||||
$DOCKER ps
|
||||
printHelp
|
||||
exit 1
|
||||
fi
|
||||
set -e
|
||||
|
||||
# help print function
|
||||
function printHelp {
|
||||
echo "########################################################
|
||||
## A script to compile Hyperion inside a docker container
|
||||
## Requires installed Docker: https://www.docker.com/
|
||||
## Without arguments it will compile Hyperion for Ubuntu 16.04 (x64) or higher.
|
||||
## Supports Raspberry Pi (armv6) cross compilation (Raspbian Stretch)
|
||||
##
|
||||
## Homepage: https://www.hyperion-project.org
|
||||
## Forum: https://forum.hyperion-project.org
|
||||
########################################################
|
||||
# These are possible arguments to modify the script behaviour with their default values
|
||||
#
|
||||
# docker-compile.sh -h # Show this help message
|
||||
# docker-compile.sh -t ubuntu1604 # The docker tag, one of ubuntu1604 | cross-qemu-rpistretch
|
||||
# docker-compile.sh -b Release # cmake Release or Debug build
|
||||
# docker-compile.sh -p true # If true build packages with CPack
|
||||
# More informations to docker tags at: https://hub.docker.com/r/hyperionorg/hyperion-ci/"
|
||||
}
|
||||
|
||||
while getopts t:b:p:h option
|
||||
do
|
||||
case "${option}"
|
||||
in
|
||||
t) BUILD_TARGET=${OPTARG};;
|
||||
b) BUILD_TYPE=${OPTARG};;
|
||||
p) BUILD_PACKAGES=${OPTARG};;
|
||||
h) printHelp; exit 0;;
|
||||
esac
|
||||
done
|
||||
|
||||
# determine package creation
|
||||
if [ $BUILD_PACKAGES == "true" ]; then
|
||||
PACKAGES="package"
|
||||
fi
|
||||
|
||||
echo "---> Initilize with BUILD_TARGET=${BUILD_TARGET}, BUILD_TYPE=${BUILD_TYPE}, BUILD_PACKAGES=${BUILD_PACKAGES}"
|
||||
|
||||
# cleanup deploy folder, create folder for ownership
|
||||
sudo rm -fr $SCRIPT_PATH/deploy >/dev/null 2>&1
|
||||
mkdir $SCRIPT_PATH/deploy >/dev/null 2>&1
|
||||
|
||||
# get Hyperion source, cleanup previous folder
|
||||
echo "---> Downloading Hyperion source code from ${GIT_REPO_URL}"
|
||||
sudo rm -fr $SCRIPT_PATH/hyperion >/dev/null 2>&1
|
||||
git clone --recursive --depth 1 -q -b rework $GIT_REPO_URL $SCRIPT_PATH/hyperion || { echo "---> Failed to download Hyperion source code! Abort"; exit 1; }
|
||||
|
||||
# start compilation
|
||||
# Remove container after stop
|
||||
# Mount /deploy to /deploy
|
||||
# Mount source dir to /source
|
||||
# Target docker image
|
||||
# execute inside container all commands on bash
|
||||
echo "---> Startup docker..."
|
||||
$DOCKER run --rm \
|
||||
-v "${SCRIPT_PATH}/deploy:/deploy" \
|
||||
-v "${SCRIPT_PATH}/hyperion:/source:ro" \
|
||||
hyperionorg/hyperion-ci:$BUILD_TARGET \
|
||||
/bin/bash -c "mkdir build && cp -r /source/. /build &&
|
||||
cd /build && mkdir build && cd build &&
|
||||
cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. || exit 2 &&
|
||||
make -j $(nproc) ${PACKAGES} || exit 3 &&
|
||||
echo '---> Copy binaries and packages to host folder: ${SCRIPT_PATH}/deploy' &&
|
||||
cp -v /build/build/bin/h* /deploy/ 2>/dev/null || : &&
|
||||
cp -v /build/build/Hyperion-* /deploy/ 2>/dev/null || : &&
|
||||
exit 0;
|
||||
exit 1 " || { echo "---> Hyperion compilation failed! Abort"; exit 4; }
|
||||
|
||||
# overwrite file owner to current user
|
||||
sudo chown -fR $(stat -c "%U:%G" $SCRIPT_PATH/deploy) $SCRIPT_PATH/deploy
|
||||
|
||||
echo "---> Script finished, view folder ${SCRIPT_PATH}/deploy for compiled packages and binaries"
|
||||
exit 0
|
||||
@@ -1,165 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Script to add a second or more hyperion instance(s) to the corresponding system service
|
||||
|
||||
# Make sure /sbin is on the path (for service to find sub scripts)
|
||||
PATH="/sbin:$PATH"
|
||||
|
||||
#Check, if script is running as root
|
||||
if [ $(id -u) != 0 ]; then
|
||||
echo '---> Critical Error: Please run the script as root (sudo sh ./setup_hyperion_forward.sh) -> abort'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#Welcome message
|
||||
echo '*******************************************************************************'
|
||||
echo 'This setup script will duplicate the hyperion service'
|
||||
echo 'Choose the name(s) for one or more config files - one service for each config'
|
||||
echo 'Created by brindosch - hyperion-project.org - the official Hyperion source.'
|
||||
echo '*******************************************************************************'
|
||||
|
||||
#Prompt for confirmation to proceed
|
||||
while true
|
||||
do
|
||||
echo -n "---> Do you really want to proceed? (y or n) :"
|
||||
read CONFIRM
|
||||
case $CONFIRM in
|
||||
y|Y|YES|yes|Yes) break ;;
|
||||
n|N|no|NO|No)
|
||||
echo "---> Aborting - you entered \"$CONFIRM\""
|
||||
exit
|
||||
;;
|
||||
*) echo "-> Please enter only y or n"
|
||||
esac
|
||||
done
|
||||
echo "---> You entered \"$CONFIRM\". We will proceed!"
|
||||
echo ""
|
||||
|
||||
#Check which system we are on
|
||||
OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex\|LibreELEC' /etc/issue`
|
||||
USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm`
|
||||
USE_INITCTL=`which /sbin/initctl | wc -l`
|
||||
USE_SERVICE=`which /usr/sbin/service | wc -l`
|
||||
|
||||
#Setting up the paths to service files
|
||||
if [ $USE_INITCTL -eq 1 ]; then
|
||||
SERVICEPATH=/etc/init
|
||||
elif [ $OS_OPENELEC -eq 1 ]; then
|
||||
SERVICEPATH=/storage/.config
|
||||
elif [ $USE_SYSTEMD -eq 1 ]; then
|
||||
SERVICEPATH=/etc/systemd/system
|
||||
elif [ $USE_SERVICE -eq 1 ]; then
|
||||
SERVICEPATH/etc/init.d
|
||||
fi
|
||||
|
||||
#Setting up the default PROTO/JSON ports
|
||||
JSONPORT=19444
|
||||
PROTOPORT=19445
|
||||
# and service count
|
||||
SERVICEC=1
|
||||
|
||||
#Setting up the paths to config files
|
||||
if [ $OS_OPENELEC -eq 1 ]; then
|
||||
CONFIGPATH=/storage/.config
|
||||
else CONFIGPATH=/opt/hyperion/config
|
||||
fi
|
||||
|
||||
#Ask the user for some informations regarding the setup
|
||||
echo "---> Please enter the config name(s) you want to create"
|
||||
echo "---> Information: One name creates one service and two names two services etc"
|
||||
echo '---> Please enter them seperated with a space in a one line row!'
|
||||
echo '---> example: hyperion.philipshue_1.json hyperion.AtmoOrb_2.json hypthreeconf.json'
|
||||
echo '---> In any case, add ".json" at the end of each file name'
|
||||
read -p 'Config file name(s): ' FILENAMES
|
||||
echo '---> Thank you, we will modify your Hyperion installation now'
|
||||
sleep 2
|
||||
|
||||
#Processing input
|
||||
set $FILENAMES
|
||||
FWCOUNT=${#}
|
||||
|
||||
#Convert all old config file paths to make sure this script is working (default for new installs with 1.02.0 and higher)
|
||||
if [ $USE_INITCTL -eq 1 ]; then
|
||||
sed -i "s|/etc/hyperion.config.json|/etc/hyperion/hyperion.config.json|g" $SERVICEPATH/hyperion.conf
|
||||
elif [ $OS_OPENELEC -eq 1 ]; then
|
||||
sleep 0
|
||||
elif [ $USE_SYSTEMD -eq 1 ]; then
|
||||
sed -i "s|/etc/hyperion.config.json|/etc/hyperion/hyperion.config.json|g" $SERVICEPATH/hyperion.service
|
||||
elif [ $USE_SERVICE -eq 1 ]; then
|
||||
sed -i "s|/etc/hyperion.config.json|/etc/hyperion/hyperion.config.json|g" $SERVICEPATH/hyperion
|
||||
fi
|
||||
|
||||
#Processing service files
|
||||
if [ $USE_INITCTL -eq 1 ]; then
|
||||
echo "---> Initctl detected, processing service files"
|
||||
while [ $SERVICEC -le $FWCOUNT ]; do
|
||||
echo "Processing service ${SERVICEC}: \"hyperion_fw${SERVICEC}.conf\""
|
||||
if [ -e "${SERVICEPATH}/hyperion_fw${SERVICEC}.conf" ]; then
|
||||
echo "Service was already created - skipped"
|
||||
echo "Input \"${1}\" was skipped"
|
||||
else
|
||||
echo "Create ${SERVICEPATH}/hyperion_fw${SERVICEC}.conf"
|
||||
cp -s $SERVICEPATH/hyperion.conf $SERVICEPATH/hyperion_fw$SERVICEC.conf
|
||||
echo "Config name changed to \"${1}\" inside \"hyperion_fw${SERVICEC}.conf\""
|
||||
sed -i "s/hyperion.config.json/$1/g" $SERVICEPATH/hyperion_fw$SERVICEC.conf
|
||||
initctl reload-configuration
|
||||
fi
|
||||
shift
|
||||
SERVICEC=$((SERVICEC + 1))
|
||||
done
|
||||
elif [ $OS_OPENELEC -eq 1 ]; then
|
||||
echo "---> OE/LE detected, processing autostart.sh"
|
||||
while [ $SERVICEC -le $FWCOUNT ]; do
|
||||
echo "${SERVICEC}. processing OE autostart.sh entry \"${1}\""
|
||||
OE=`grep -m1 -c ${1} $SERVICEPATH/autostart.sh`
|
||||
if [ $OE -eq 0 ]; then
|
||||
echo "Add config name \"${1}\" to \"autostart.sh\""
|
||||
echo "/storage/hyperion/bin/hyperiond.sh /storage/.config/${1} > /storage/logfiles/hyperion_fw${SERVICEC}.log 2>&1 &" >> /storage/.config/autostart.sh
|
||||
else
|
||||
echo "\"${1}\" was already added - skipped"
|
||||
fi
|
||||
shift
|
||||
SERVICEC=$((SERVICEC + 1))
|
||||
done
|
||||
elif [ $USE_SYSTEMD -eq 1 ]; then
|
||||
echo "---> Systemd detected, processing service files"
|
||||
while [ $SERVICEC -le $FWCOUNT ]; do
|
||||
echo "Processing service ${SERVICEC}: \"hyperion_fw${SERVICEC}.service\""
|
||||
if [ -e "${SERVICEPATH}/hyperion_fw${SERVICEC}.service" ]; then
|
||||
echo "Service was already created - skipped"
|
||||
echo "Input \"${1}\" was skipped"
|
||||
else
|
||||
echo "Create ${SERVICEPATH}/hyperion_fw${SERVICEC}.service"
|
||||
cp -s $SERVICEPATH/hyperion.service $SERVICEPATH/hyperion_fw$SERVICEC.service
|
||||
echo "Config name changed to \"${1}\" inside \"hyperion_fw${SERVICEC}.service\""
|
||||
sed -i "s/hyperion.config.json/$1/g" $SERVICEPATH/hyperion_fw$SERVICEC.service
|
||||
systemctl -q enable hyperion_fw$SERVICEC.service
|
||||
fi
|
||||
shift
|
||||
SERVICEC=$((SERVICEC + 1))
|
||||
done
|
||||
elif [ $USE_SERVICE -eq 1 ]; then
|
||||
echo "---> Init.d detected, processing service files"
|
||||
while [ $SERVICEC -le $FWCOUNT ]; do
|
||||
echo "Processing service ${SERVICEC}: \"hyperion_fw${SERVICEC}\""
|
||||
if [ -e "${SERVICEPATH}/hyperion_fw${SERVICEC}" ]; then
|
||||
echo "Service was already created - skipped"
|
||||
echo "Input \"${1}\" was skipped"
|
||||
else
|
||||
echo "Create ${SERVICEPATH}/hyperion_fw${SERVICEC}"
|
||||
cp -s $SERVICEPATH/hyperion $SERVICEPATH/hyperion_fw$SERVICEC
|
||||
echo "Config name changed to \"${1}\" inside \"hyperion_fw${SERVICEC}\""
|
||||
sed -i "s/hyperion.config.json/$1/g" $SERVICEPATH/hyperion_fw$SERVICEC
|
||||
update-rc.d hyperion_fw$SERVICEC defaults 98 02
|
||||
fi
|
||||
shift
|
||||
SERVICEC=$((SERVICEC + 1))
|
||||
done
|
||||
fi
|
||||
|
||||
#Service creation done
|
||||
echo '*******************************************************************************'
|
||||
echo 'Script done all actions - all input processed'
|
||||
echo 'Now upload your configuration(s) with HyperCon at the SSH Tab'
|
||||
echo 'All created Hyperion services will start with your chosen confignames'
|
||||
echo 'Wiki: wiki.hyperion-project.org Webpage: www.hyperion-project.org'
|
||||
echo '*******************************************************************************'
|
||||
Reference in New Issue
Block a user