Updated OSX installer scripts (#30)

freelan-developers · Apr 16, 2015 · b41e038 · b41e038
1 parent 310ef25
commit b41e038
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packaging/osx/Makefile b/packaging/osx/Makefile
@@ -1,6 +1,6 @@
 PRODUCT_NAME=freelan
 IDENTIFIER=org.freelan.freelan
-VERSION=1.1
+VERSION=2.0
 DAEMON_PACKAGE=${IDENTIFIER}.pkg
 FINAL_PACKAGE=${PRODUCT_NAME}_${VERSION}.pkg
 
@@ -13,12 +13,10 @@ clean:
 
 package: clean
 	mkdir -p ${IDENTIFIER}
-	mkdir -p ${IDENTIFIER}/usr/local/sbin
-	mkdir -p ${IDENTIFIER}/usr/local/etc/freelan
+	mkdir -p ${IDENTIFIER}/usr/local
 	mkdir -p ${IDENTIFIER}/usr/local/share/freelan
 	mkdir -p ${IDENTIFIER}/Library/LaunchDaemons
-	cp ../../install/bin/freelan ${IDENTIFIER}/usr/local/sbin/
-	cp ../../freelan/config/freelan.cfg ${IDENTIFIER}/usr/local/etc/freelan/
+	cp -r ../../install/* ${IDENTIFIER}/usr/local/
 	cp org.freelan.freelan.plist ${IDENTIFIER}/Library/LaunchDaemons/
 	cp uninstall.sh ${IDENTIFIER}/usr/local/share/freelan/
 	pkgbuild --root ${IDENTIFIER} --identifier ${IDENTIFIER} --version ${VERSION} --ownership recommended --scripts scripts ${DAEMON_PACKAGE}

diff --git a/packaging/osx/org.freelan.freelan.plist b/packaging/osx/org.freelan.freelan.plist
@@ -6,7 +6,7 @@
   <string>org.freelan.freelan</string>
   <key>ProgramArguments</key>
   <array>
-    <string>/usr/local/sbin/freelan</string>
+    <string>/usr/local/bin/freelan</string>
     <string>-c</string>
     <string>/usr/local/etc/freelan/freelan.cfg</string>
     <string>-f</string>