packpack - download and unpack rtspserver tarball correctly

This commit is contained in:
Andrew Bauer 2021-04-07 13:10:53 -05:00
parent 663c7f51f5
commit 5684413eaa
1 changed files with 13 additions and 11 deletions

View File

@ -118,13 +118,14 @@ commonprep () {
fi fi
fi fi
if [ -e "build/RtspServer" ]; then RTSPVER="8ef9169c473da2f77752b5c43ae2dd7a82596876"
echo "Found existing RtspServer..." if [ -e "build/RtspServer-${RTSPVER}.tar.gz" ]; then
echo "Found existing RtspServer ${CEBVER} tarball..."
else else
echo "Cloning RtspServer ..." echo "Retrieving RTSP ${RTSPVER} submodule..."
git clone https://github.com/ZoneMinder/RtspServer build/RtspServer curl -L https://github.com/ZoneMinder/RtspServer/archive/${RTSPVER}.tar.gz > build/RtspServer-${RTSPVER}.tar.gz
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: RtspServer clone failed..." echo "ERROR: RtspServer tarball retreival failed..."
exit 1 exit 1
fi fi
fi fi
@ -151,9 +152,10 @@ movecrud () {
if [ -e "dep/RtspServer/CMakeLists.txt" ]; then if [ -e "dep/RtspServer/CMakeLists.txt" ]; then
echo "RtspServer already installed..." echo "RtspServer already installed..."
else else
echo "Copying RtspServer..." echo "Unpacking RtspServer..."
rm -r dep/RtspServer tar -xzf build/RtspServer-${RTSPVER}.tar.gz
cp -Rpd build/RtspServer dep/RtspServer rmdir dep/RtspServer
mv -f RtspServer-${RTSPVER} dep/RtspServer
fi fi
} }