Fix install-required-packages script to self-update apt (#8491)
* Fix our install-required-packages script to automatically run apt-get update on systems (almost every other package manager self-updates anyway) * Add -o Acquire::Check-Valid-Until=false for Debian 8 (jessie)
James Mills committed
Mar 26, 2020 at 08:23 UTC
e6c7dfa950325fea0561c23a220895cdde5ffcd9
1 file changed
+15
-13
packaging/installer/install-required-packages.sh
+15
-13
@@ -1265,14 +1265,6 @@ validate_install_apt_get() {
1265
}
1266
1267
install_apt_get() {
1268
- # download the latest package info
1269
- if [ "${DRYRUN}" -eq 1 ]; then
1270
- echo >&2 " >> IMPORTANT << "
1271
- echo >&2 " Please make sure your system is up to date"
1272
- echo >&2 " by running: ${sudo} apt-get update "
1273
- echo >&2
1274
- fi
1275
-
1268
local opts=""
1269
if [ "${NON_INTERACTIVE}" -eq 1 ]; then
1270
echo >&2 "Running in non-interactive mode"
@@ -1283,6 +1275,16 @@ install_apt_get() {
1275
1276
read -r -a apt_opts <<< "$opts"
1277
1278
+ # update apt repository caches
1279
+
1280
+ echo >&2 "NOTE: Running apt-get update and updating your APT caches ..."
1281
+ if [ "${version}" = 8 ]; then
1282
+ echo >&2 "WARNING: You seem to be on Debian 8 (jessie) which is old enough we have to disable Check-Valid-Until checks"
1283
+ run ${sudo} apt-get "${apt_opts[@]}" -o Acquire::Check-Valid-Until=false update
1284
+ else
1285
+ run ${sudo} apt-get "${apt_opts[@]}" update
1286
+ fi
1287
+
1288
# install the required packages
1289
run ${sudo} apt-get "${apt_opts[@]}" install "${@}"
1290
}
@@ -1712,7 +1714,7 @@ while [ -n "${1}" ]; do
1714
netdata-all)
1715
PACKAGES_NETDATA=1
1716
PACKAGES_NETDATA_NODEJS=1
1715
- if [ "${pv}" -eq 2 ] ; then
1717
+ if [ "${pv}" -eq 2 ]; then
1718
PACKAGES_NETDATA_PYTHON=1
1719
PACKAGES_NETDATA_PYTHON_MYSQL=1
1720
PACKAGES_NETDATA_PYTHON_POSTGRES=1
@@ -1742,7 +1744,7 @@ while [ -n "${1}" ]; do
1744
;;
1745
1746
python-mysql | mysql-python | mysqldb | netdata-mysql)
1745
- if [ "${pv}" -eq 2 ] ; then
1747
+ if [ "${pv}" -eq 2 ]; then
1748
PACKAGES_NETDATA_PYTHON=1
1749
PACKAGES_NETDATA_PYTHON_MYSQL=1
1750
else
@@ -1752,7 +1754,7 @@ while [ -n "${1}" ]; do
1754
;;
1755
1756
python-postgres | postgres-python | psycopg2 | netdata-postgres)
1755
- if [ "${pv}" -eq 2 ] ; then
1757
+ if [ "${pv}" -eq 2 ]; then
1758
PACKAGES_NETDATA_PYTHON=1
1759
PACKAGES_NETDATA_PYTHON_POSTGRES=1
1760
else
@@ -1762,7 +1764,7 @@ while [ -n "${1}" ]; do
1764
;;
1765
1766
python-pymongo)
1765
- if [ "${pv}" -eq 2 ] ; then
1767
+ if [ "${pv}" -eq 2 ]; then
1768
PACKAGES_NETDATA_PYTHON=1
1769
PACKAGES_NETDATA_PYTHON_MONGO=1
1770
else
@@ -1795,7 +1797,7 @@ while [ -n "${1}" ]; do
1797
demo | all)
1798
PACKAGES_NETDATA=1
1799
PACKAGES_NETDATA_NODEJS=1
1798
- if [ "${pv}" -eq 2 ] ; then
1800
+ if [ "${pv}" -eq 2 ]; then
1801
PACKAGES_NETDATA_PYTHON=1
1802
PACKAGES_NETDATA_PYTHON_MYSQL=1
1803
PACKAGES_NETDATA_PYTHON_POSTGRES=1