Merge branch 'development' into fix/install_deps_exit

Conflicts:
	automated install/basic-install.sh
This commit is contained in:
DL6ER
2016-12-21 11:54:52 +01:00

View File

@@ -225,9 +225,7 @@ verifyFreeDiskSpace() {
echo "Insufficient free space, exiting..."
exit 1
fi
}
@@ -625,7 +623,6 @@ clean_existing() {
for script in "${old_files[@]}"; do
rm -f "${clean_directory}${script}.sh"
done
}
installScripts() {
@@ -1008,7 +1005,6 @@ update_dialogs() {
echo "::: Cancel selected. Exiting..."
exit 1
fi
}
main() {