Some simplification

3 files changed, 9 insertions, 16 deletions

diff --git a/share/hydractl/install b/share/hydractl/install
index 0f43b4f..baae176 100755
--- a/share/hydractl/install
+++ b/share/hydractl/install
@@ -35,8 +35,8 @@ echo "Installing to local node..."
 
 if ! which git &> /dev/null; then
   echo "Installing git..."
-  $sudo aptitude update
-  $sudo aptitude install git-core -y
+  $sudo apt-get update
+  $sudo apt-get install git-core -y
 fi
 
 # Git version
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index ec3c5c3..ab32bf7 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -129,23 +129,16 @@ function hydra_system_upgrade_upgrade {
 
 # Cleanup procedures
 function hydra_system_upgrade_cleanup {
-  apt-get autoremove -y
+  apt-get autoremove -y --purge
   apt-get clean
   hydra_system_upgrade_stage custom
 }
 
 # Custom upgrade procedures
 function hydra_system_upgrade_custom {
-  if [ "$nextrelease" == "wheezy" ]; then
-    # Old suhosin config
-    rm -f /etc/php5/conf.d/suhosin.ini
-
-    # This has to be manually installed again
-    if [ -f "/etc/php5/cli/conf.d/uploadprogress.ini" ]; then
-      pecl uninstall uploadprogress
-      pecl install   uploadprogress
-    fi
-  fi
+  #if [ "$nextrelease" == "jessie" ]; then
+  #  # Do your custom jessie stuff here
+  #fi
 
   hydractl trac-upgrade
   hydra_system_upgrade_stage puppet
diff --git a/share/hydractl/upgrade b/share/hydractl/upgrade
index e3c1141..a4d9917 100755
--- a/share/hydractl/upgrade
+++ b/share/hydractl/upgrade
@@ -26,8 +26,8 @@ fi
 
 # Issue upgrade
 if ! $sudo lsof /var/lib/dpkg/lock &> /dev/null; then
-  $sudo aptitude update
-  $sudo aptitude full-upgrade -y
+  $sudo apt-get update
+  $sudo apt-get full-upgrade -y
 else
   echo "Apt is locked, aborting."
 fi
@@ -40,5 +40,5 @@ hydractl pbuilder-upgrade
 
 # Cleanup
 if [ "$CLEAN" == "clean" ]; then
-  $sudo aptitude clean
+  $sudo apt-get clean
 fi