update
This commit is contained in:
22
run.sh
22
run.sh
@@ -8,7 +8,7 @@ source /opt/idssys/mediamanager/defaults.inc
|
||||
if [ -f /opt/idssys/settings/mediamanager.conf ]; then
|
||||
source /opt/idssys/settings/mediamanager.conf
|
||||
else
|
||||
source /opt/idssys/mediamanager/settings.conf
|
||||
source ${MMFOLDER}/settings.conf
|
||||
fi
|
||||
|
||||
if [ "${1}" == "update" ]; then
|
||||
@@ -31,7 +31,7 @@ if [ "${1}" == "update" ]; then
|
||||
git pull >/dev/null 2>&1
|
||||
git submodule update --remote >/dev/null 2>&1
|
||||
fi
|
||||
cd /opt/idssys/mediamanager
|
||||
cd ${MMFOLDER}
|
||||
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
|
||||
if [ "${2}" != "q" ]; then
|
||||
echo -en "\e[1A";
|
||||
@@ -44,7 +44,7 @@ if [ "${1}" == "update" ]; then
|
||||
git prune >/dev/null 2>&1
|
||||
git pull >/dev/null 2>&1
|
||||
git submodule update --remote >/dev/null 2>&1
|
||||
/bin/chmod +x /opt/idssys/mediamanager/mm-scripts.sh 2>&1
|
||||
/bin/chmod +x ${MMFOLDER}/mm-scripts.sh 2>&1
|
||||
if [ "${2}" != "q" ]; then
|
||||
echo -en "\e[1A";
|
||||
echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
|
||||
@@ -58,20 +58,20 @@ if [ "${1}" == "update" ]; then
|
||||
fi
|
||||
|
||||
else
|
||||
[ "${1}" == "clear" ] && rm -f /opt/idssys/mediamanager/mm.*
|
||||
if [ -f /opt/idssys/mediamanager/mm.checking ]; then
|
||||
fd=$(( `date +%s` - `stat -L --format %Y /opt/idssys/mediamanager/mm.checking` ))
|
||||
[ "${1}" == "clear" ] && rm -f ${MMFOLDER}/mm.*
|
||||
if [ -f ${MMFOLDER}/mm.checking ]; then
|
||||
fd=$(( `date +%s` - `stat -L --format %Y ${MMFOLDER}/mm.checking` ))
|
||||
if [ ${fd} -gt 900 ]; then
|
||||
rm -f /opt/idssys/mediamanager/mm.checking
|
||||
rm -f ${MMFOLDER}/mm.checking
|
||||
else
|
||||
echo -e "${idsCL[LightCyan]}Try again later, 'mm' program currently in use...${idsCL[Default]}"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -f /opt/idssys/mediamanager/mm.checking ]; then
|
||||
touch /opt/idssys/mediamanager/mm.checking
|
||||
/opt/idssys/mediamanager/mm-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}
|
||||
rm -f /opt/idssys/mediamanager/mm.checking
|
||||
if [ ! -f ${MMFOLDER}/mm.checking ]; then
|
||||
touch ${MMFOLDER}/mm.checking
|
||||
${MMFOLDER}/mm-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}
|
||||
rm -f ${MMFOLDER}/mm.checking
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user