From ee66747def10ad754f560cc8e0535bd403b95adf Mon Sep 17 00:00:00 2001 From: meeh <meeh@mail.i2p> Date: Mon, 17 Sep 2012 20:33:03 +0000 Subject: [PATCH] Fix after review and install on fresh osx (lession learned: test clean installs) --- installer/install.xml | 2 +- installer/resources/install_i2p_service_osx.command | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/install.xml b/installer/install.xml index 2ee251e782..7e77951a28 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -187,7 +187,7 @@ <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" /> <args><arg value="$INSTALL_PATH/Start I2P Router.app" /></args></executable> <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" /> - <args><arg value="$INSTALL_PATH/net.i2p.router.plist" /></args></executable> + <args><arg value="$INSTALL_PATH/net.i2p.router.plist.template" /></args></executable> <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" /> <args><arg value="$INSTALL_PATH/install_i2p_service_osx.command" /></args></executable> <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" /> diff --git a/installer/resources/install_i2p_service_osx.command b/installer/resources/install_i2p_service_osx.command index e8d92b0813..95da7aedc0 100644 --- a/installer/resources/install_i2p_service_osx.command +++ b/installer/resources/install_i2p_service_osx.command @@ -5,7 +5,7 @@ # Author: Meeh cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" shfile="tmp$$.sh" -echo -n 'cat `pwd`/net.i2p.router.plist |' > `pwd`/$shfile +echo -n 'cat `pwd`/net.i2p.router.plist.template |' > `pwd`/$shfile echo -n "sed 's#USERNAME#`whoami`#' " >> `pwd`/$shfile echo -n '| sed "s#COMMAND#`pwd`/i2prouter#" | sed "s#I2PPATH#`pwd`/#" > /Library/LaunchDaemons/net.i2p.router.plist' >> `pwd`/$shfile chmod +x `pwd`/$shfile -- GitLab