kopia lustrzana https://github.com/jprochazka/adsb-receiver
Added a way to force apt update.
rodzic
0da0c7b3b6
commit
6bbae71eb9
|
@ -178,12 +178,13 @@ function UpdateOperatingSystem() {
|
||||||
|
|
||||||
## Update the repository packages and check that prerequisite packages are installed.
|
## Update the repository packages and check that prerequisite packages are installed.
|
||||||
|
|
||||||
# Only call AptUpdate if last update was more than ${APT_UPDATE_THRESHOLD} seconds ago.
|
# Only call AptUpdate if last update was more than ${APT_UPDATE_THRESHOLD} seconds ago or if the user forced the update.
|
||||||
APT_UPDATE_THRESHOLD="1800"
|
APT_UPDATE_THRESHOLD="1800"
|
||||||
APT_UPDATE_CURRENT_EPOCH=`date +%s`
|
APT_UPDATE_CURRENT_EPOCH=`date +%s`
|
||||||
APT_UPDATE_LAST_EPOCH=`stat -c %Y /var/cache/apt/pkgcache.bin`
|
APT_UPDATE_LAST_EPOCH=`stat -c %Y /var/cache/apt/pkgcache.bin`
|
||||||
APT_UPDATE_DELTA=`echo $[${APT_UPDATE_CURRENT_EPOCH} - ${APT_UPDATE_LAST_EPOCH}]`
|
APT_UPDATE_DELTA=`echo $[${APT_UPDATE_CURRENT_EPOCH} - ${APT_UPDATE_LAST_EPOCH}]`
|
||||||
if [[ "${APT_UPDATE_DELTA}" -gt "${APT_UPDATE_THRESHOLD}" ]] ; then
|
|
||||||
|
if [[ "${APT_UPDATE_DELTA}" -gt "${APT_UPDATE_THRESHOLD}" ]] || [[ "${RECEIVER_FORCE_APT_UPDATE}" = "true" ]] ; then
|
||||||
AptUpdate
|
AptUpdate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
13
install.sh
13
install.sh
|
@ -66,6 +66,7 @@ function DisplayHelp() {
|
||||||
echo "-h --help Shows this message."
|
echo "-h --help Shows this message."
|
||||||
echo "-l --log-output Logs all output to a file in the logs directory."
|
echo "-l --log-output Logs all output to a file in the logs directory."
|
||||||
echo "-m <MTA> --mta=<MTA> Specify which email MTA to use currently Exim or Postfix."
|
echo "-m <MTA> --mta=<MTA> Specify which email MTA to use currently Exim or Postfix."
|
||||||
|
echo "-u --apt-update Forces the apt update command to be ran."
|
||||||
echo "-v --verbose Provides extra confirmation at each stage of the install."
|
echo "-v --verbose Provides extra confirmation at each stage of the install."
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
@ -123,7 +124,7 @@ while [[ $# -gt 0 ]] ; do
|
||||||
fi
|
fi
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
--mta*)
|
--mta*)
|
||||||
MTA=`echo ${1^^} | sed -e 's/^[^=]*=//g'`
|
MTA=`echo ${1^^} | sed -e 's/^[^=]*=//g'`
|
||||||
if [ $MTA != "EXIM" ] && [ $MTA != "POSTFIX" ]; then
|
if [ $MTA != "EXIM" ] && [ $MTA != "POSTFIX" ]; then
|
||||||
echo "MTA can only be either EXIM or POSTFIX."
|
echo "MTA can only be either EXIM or POSTFIX."
|
||||||
|
@ -131,7 +132,11 @@ while [[ $# -gt 0 ]] ; do
|
||||||
fi
|
fi
|
||||||
shift 1
|
shift 1
|
||||||
;;
|
;;
|
||||||
|
-u|--apt-update)
|
||||||
|
# Force apt update.
|
||||||
|
FORCE_APT_UPDATE="true"
|
||||||
|
shift 1
|
||||||
|
;;
|
||||||
-v|--verbose)
|
-v|--verbose)
|
||||||
# Provides extra confirmation at each stage of the install.
|
# Provides extra confirmation at each stage of the install.
|
||||||
VERBOSE="true"
|
VERBOSE="true"
|
||||||
|
@ -164,8 +169,9 @@ fi
|
||||||
export RECEIVER_AUTOMATED_INSTALL=${AUTOMATED_INSTALL}
|
export RECEIVER_AUTOMATED_INSTALL=${AUTOMATED_INSTALL}
|
||||||
export RECEIVER_PROJECT_BRANCH=${PROJECT_BRANCH}
|
export RECEIVER_PROJECT_BRANCH=${PROJECT_BRANCH}
|
||||||
export RECEIVER_CONFIGURATION_FILE=${CONFIGURATION_FILE}
|
export RECEIVER_CONFIGURATION_FILE=${CONFIGURATION_FILE}
|
||||||
export RECEIVER_VERBOSE=${VERBOSE}
|
|
||||||
export RECEIVER_MTA=${MTA}
|
export RECEIVER_MTA=${MTA}
|
||||||
|
export RECEIVER_FORCE_APT_UPDATE=$FORCE_APT_UPDATE
|
||||||
|
export RECEIVER_VERBOSE=${VERBOSE}
|
||||||
|
|
||||||
## EXECUTE BASH/INIT.SH
|
## EXECUTE BASH/INIT.SH
|
||||||
|
|
||||||
|
@ -197,6 +203,7 @@ unset RECEIVER_BUILD_DIRECTORY
|
||||||
unset RECEIVER_PROJECT_BRANCH
|
unset RECEIVER_PROJECT_BRANCH
|
||||||
unset RECEIVER_AUTOMATED_INSTALL
|
unset RECEIVER_AUTOMATED_INSTALL
|
||||||
unset RECEIVER_CONFIGURATION_FILE
|
unset RECEIVER_CONFIGURATION_FILE
|
||||||
|
unset RECEIVER_FORCE_APT_UPDATE
|
||||||
unset RECEIVER_VERBOSE
|
unset RECEIVER_VERBOSE
|
||||||
unset RECEIVER_PROJECT_TITLE
|
unset RECEIVER_PROJECT_TITLE
|
||||||
unset RECEIVER_MTA
|
unset RECEIVER_MTA
|
||||||
|
|
Ładowanie…
Reference in New Issue