Merge pull request #144 from RallySoftware-cookbooks/Issue-134

Issue #134 Remove /var/lib/alternatives/#{cmd} before calling alternatives.

Author: carmstrong

providers/alternatives.rb

@@ -38,6 +38,7 @@
         description = "Add alternative for #{cmd}"
         converge_by(description) do
           Chef::Log.debug "Adding alternative for #{cmd}"
+          shell_out("rm /var/lib/alternatives/#{cmd}")
           install_cmd = shell_out("#{alternatives_cmd} --install #{bin_path} #{cmd} #{alt_path} #{priority}")
           unless install_cmd.exitstatus == 0
             Chef::Application.fatal!(%Q[ set alternative failed ])

test/integration/openjdk-7/bats/verify_openjdk-7.bats

@@ -7,3 +7,8 @@
   run test -d $JAVA_HOME
   [ "$status" -eq 0 ]
 }
+
+@test "properly links jar" {
+  run test -L /usr/bin/jar
+  [ "$status" -eq 0 ]
+}

test/integration/openjdk/bats/verify_openjdk.bats

@@ -7,3 +7,8 @@
   run test -d $JAVA_HOME
   [ "$status" -eq 0 ]
 }
+
+@test "properly links jar" {
+  run test -L /usr/bin/jar
+  [ "$status" -eq 0 ]
+}

test/integration/oracle-7/bats/verify_oracle-7.bats

@@ -7,3 +7,8 @@
   run test -d $JAVA_HOME
   [ "$status" -eq 0 ]
 }
+
+@test "properly links jar" {
+  run test -L /usr/bin/jar
+  [ "$status" -eq 0 ]
+}

test/integration/oracle/bats/verify_oracle.bats

@@ -7,3 +7,8 @@
   run test -d $JAVA_HOME
   [ "$status" -eq 0 ]
 }
+
+@test "properly links jar" {
+  run test -L /usr/bin/jar
+  [ "$status" -eq 0 ]
+}