Merge branch 'master' of github.com:Dids/clobber

Dids · Nov 4, 2018 · 39054c4 · 39054c4
2 parents b6a155e + d72ad4c
commit 39054c4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cmd/root.go b/cmd/root.go
@@ -291,8 +291,13 @@ var RootCmd = &cobra.Command{
 			if err := patches.Patch(packedPatches, "buildpkg_old", util.GetCloverPath()+"/CloverPackage/package/buildpkg.sh"); err != nil {
 				log.Fatal("Error: Failed to patch Clover installer: ", err)
 			}
+			// Load the patch
+			backgroundPatch, backgroundPatchErr := packedAssets.Find("background.tiff")
+			if backgroundPatchErr != nil {
+				log.Fatal("Error: Failed to patch Clover installer: ", backgroundPatchErr)
+			}
 			// Replace the Clover installer background image with our own
-			if err := ioutil.WriteFile(util.GetCloverPath()+"/CloverPackage/package/Resources/background.tiff", packedAssets.Bytes("background.tiff"), 0644); err != nil {
+			if err := ioutil.WriteFile(util.GetCloverPath()+"/CloverPackage/package/Resources/background.tiff", backgroundPatch, 0644); err != nil {
 				log.Fatal("Error: Failed to patch Clover installer: ", err)
 			}
 			Spinner.Prefix = formatSpinnerText("Patching Clover installer", true)