From 7a8ae85b5aaf52f8e799042df07fa33478b3e9ba Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Tue, 11 Dec 2018 17:16:24 +0100
Subject: [PATCH] Do not require root privileges when installing on MacOS

Requiring general root privileges raised some trust concerns by MacOS users. This reverts the latest changes to require root to install DBus machine-id into /etc. Now the user has to do that manually via sudo. A check will be added before running into an assert.
---
 installer/installbuilder/project.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index 1382f4e50..4b75e4a47 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -108,15 +108,23 @@ it and relaunch the installer.</text>
     <postInstallationActionList>
         <runProgram>
             <program>${installdir}/bin/dbus-uuidgen</program>
-            <programArguments>--ensure=/etc/machine-id</programArguments>
+            <programArguments>--ensure=${installdir}/share/dbus-1/machine-id</programArguments>
             <ruleList>
                 <platformTest>
                     <type>osx</type>
                 </platformTest>
             </ruleList>
         </runProgram>
+        <createDirectory>
+            <path>{user_home_directory}/Library/LaunchAgents</path>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
+        </createDirectory>
         <writeFile>
-            <path>/Library/LaunchAgents/org.freedesktop.dbus-session.plist</path>
+            <path>{user_home_directory}/Library/LaunchAgents/org.freedesktop.dbus-session.plist</path>
             <encoding>utf-8</encoding>
             <text><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
@@ -151,8 +159,7 @@ it and relaunch the installer.</text>
         </writeFile>
         <runProgram>
             <program>launchctl</program>
-            <programArguments>load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist</programArguments>
-            <runAs>${env(USER)}</runAs>
+            <programArguments>load -w ${user_home_directory}/Library/LaunchAgents/org.freedesktop.dbus-session.plist</programArguments>
             <ruleList>
                 <platformTest>
                     <type>osx</type>
@@ -232,7 +239,7 @@ it and relaunch the uninstaller.</text>
             </ruleList>
         </runProgram>
         <deleteFile>
-            <path>/Library/LaunchAgents/org.freedesktop.dbus-session.plist</path>
+            <path>${user_home_directory}/Library/LaunchAgents/org.freedesktop.dbus-session.plist</path>
             <ruleList>
                 <platformTest>
                     <type>osx</type>
@@ -240,7 +247,7 @@ it and relaunch the uninstaller.</text>
             </ruleList>
         </deleteFile>
         <deleteFile>
-            <path>/etc/machine-id</path>
+            <path>${installdir}/share/dbus-1/machine-id</path>
             <ruleList>
                 <platformTest>
                     <type>osx</type>
@@ -306,7 +313,6 @@ it and relaunch the uninstaller.</text>
             <program>open</program>
             <programArguments>${Installdir}/bin/swiftlauncher.app --args -i --bootstrapurl https://datastore.swift-project.org/shared/ &amp;</programArguments>
             <progressText>Run swift launcher wizard</progressText>
-            <runAs>${env(USER)}</runAs>
             <ruleList>
                 <platformTest>
                     <type>osx</type>
@@ -351,7 +357,6 @@ it and relaunch the uninstaller.</text>
         <platformOptions>
             <height>430</height>
             <platform>osx</platform>
-            <requireInstallationByRootUser>1</requireInstallationByRootUser>
         </platformOptions>
         <platformOptions>
             <height>430</height>