Fixed dmg installation failure if GNU tar is installed (#4)

shyiko · Mar 30, 2016 · 9c3cec0 · 9c3cec0
1 parent 8126b71
commit 9c3cec0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/command/install.go b/command/install.go
@@ -217,14 +217,17 @@ func installFromDmg(source string, target string) error {
 		// oracle
 		[]string{"",
 			"if [ -f " + pkgdir + "/jdk*.pkg/Payload" + " ]; then " +
-			"tar xvf " + pkgdir + "/jdk*.pkg/Payload -C " + target +
+			"cd " + pkgdir + "/jdk*.pkg && " +
+			"cat Payload | gzip -d | cpio -i && " +
+			"mv Contents " + target + "/" +
 			"; fi"},
 
 		// apple
 		[]string{"",
 			"if [ -f " + pkgdir + "/JavaForOSX.pkg/Payload" + " ]; then " +
-			"tar xzf " + pkgdir + "/JavaForOSX.pkg/Payload -C " + pkgdir + " &&" +
-			"mv " + pkgdir + "/Library/Java/JavaVirtualMachines/*/Contents " + target + "/Contents" +
+			"cd " + pkgdir + "/JavaForOSX.pkg && " +
+			"cat Payload | gzip -d | cpio -i && " +
+			"mv Library/Java/JavaVirtualMachines/*/Contents " + target + "/" +
 			"; fi"},
 
 		[]string{"Unmounting " + source, "hdiutil unmount " + mountpoint},