From 01c7ac785b557304b1008799785f13a725a347ce Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Tue, 27 Dec 2016 21:37:16 +0100
Subject: [PATCH] Package: Set `shell.homepage` to browserhtml

Closes #12154
---
 Info.plist                       |  2 +-
 python/servo/package_commands.py | 18 ------------------
 resources/package-prefs.json     |  2 ++
 support/windows/Servo.wxs.mako   |  1 -
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/Info.plist b/Info.plist
index a3136514d3a..ded92bf0267 100644
--- a/Info.plist
+++ b/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleExecutable</key>
-	<string>run-servo</string>
+	<string>servo</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Servo</string>
 	<key>CFBundleIconFile</key>
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index 505db555847..c16d89202a5 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -221,16 +221,6 @@ class PackageCommands(CommandBase):
                     credits_file.write(template.render(version=version))
             delete(template_path)
 
-            print("Writing run-servo")
-            bhtml_path = path.join('${0%/*}', '..', 'Resources', 'browserhtml', 'index.html')
-            runservo = os.open(
-                path.join(content_dir, 'run-servo'),
-                os.O_WRONLY | os.O_CREAT,
-                int("0755", 8)
-            )
-            os.write(runservo, '#!/bin/bash\nexec ${0%/*}/servo ' + bhtml_path)
-            os.close(runservo)
-
             print("Creating dmg")
             os.symlink('/Applications', path.join(dir_to_dmg, 'Applications'))
             dmg_path = path.join(dir_to_build, "servo-tech-demo.dmg")
@@ -324,14 +314,6 @@ class PackageCommands(CommandBase):
 
             change_prefs(dir_to_resources, "linux")
 
-            print("Writing runservo.sh")
-            servo_args = ['-b',
-                          path.join('./browserhtml', 'index.html')]
-
-            runservo = os.open(path.join(dir_to_temp, 'runservo.sh'), os.O_WRONLY | os.O_CREAT, int("0755", 8))
-            os.write(runservo, "#!/usr/bin/env sh\n./servo " + ' '.join(servo_args))
-            os.close(runservo)
-
             print("Creating tarball")
             tar_path = path.join(path.dirname(binary_path), 'servo-tech-demo.tar.gz')
 
diff --git a/resources/package-prefs.json b/resources/package-prefs.json
index c6d1894c8ee..2ae926a79f6 100644
--- a/resources/package-prefs.json
+++ b/resources/package-prefs.json
@@ -2,5 +2,7 @@
   "dom.forcetouch.enabled": true,
   "dom.mozbrowser.enabled": true,
   "shell.builtin-key-shortcuts.enabled": false,
+  "os:windows,os:linux;shell.homepage": "browserhtml/index.html",
+  "os:macosx;shell.homepage": "../Resources/browserhtml/index.html",
   "os:macosx;shell.native-titlebar.enabled": false
 }
diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako
index b5e05c62d48..ab50dd84a66 100644
--- a/support/windows/Servo.wxs.mako
+++ b/support/windows/Servo.wxs.mako
@@ -38,7 +38,6 @@
                           WorkingDirectory="INSTALLDIR"
                           Icon="Servo.ico"
                           IconIndex="0"
-                          Arguments="browserhtml\index.html"
                           Advertise="yes"/>
               </File>
               <File Id="ServoManifest"