Removing remnants of python3.6 and pip

This commit is contained in:
Chris Long
2019-04-27 22:53:13 -07:00
parent 4414718cb8
commit 65381681c9
2 changed files with 66 additions and 21 deletions

View File

@@ -15,7 +15,7 @@ apt_install_prerequisites() {
}
test_prerequisites() {
for package in jq whois build-essential git docker docker-compose unzip
for package in jq whois build-essential git docker docker-compose unzip
do
echo "[TEST] Validating that $package is correctly installed..."
# Loop through each package using dpkg
@@ -32,25 +32,6 @@ test_prerequisites() {
echo "[+] $package was successfully installed!"
fi
done
# One-off support for packages which aren't installed via dpkg
for package in "pip3.6"
do
echo "[TEST] Validating that $package is correctly installed..."
# Loop through each package using which
if ! which $package > /dev/null; then
# If which returns a non-zero return code, try to re-install the package
echo "[-] $package was not found. Attempting to reinstall."
curl https://bootstrap.pypa.io/get-pip.py | sudo -H python3.6
if ! which $package > /dev/null; then
# If the reinstall fails, give up
echo "[X] Unable to install $package even after a retry. Exiting."
exit 1
fi
else
echo "[+] $package was successfully installed!"
fi
done
}
fix_eth1_static_ip() {
@@ -391,7 +372,6 @@ test_suricata_prerequisites() {
}
main() {
install_python_apt_source
apt_install_prerequisites
test_prerequisites
fix_eth1_static_ip