From 3c4994c0e14dedf328cb147daea07aecd2fceb13 Mon Sep 17 00:00:00 2001 From: sponge <sponge@mail.i2p> Date: Sun, 19 Dec 2010 00:40:01 +0000 Subject: [PATCH] Fix script so the proper encodeing is used in the JVM. --- Slackware/i2p-base/i2p-base.SlackBuild | 2 +- Slackware/i2p-base/rc.i2p_def | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Slackware/i2p-base/i2p-base.SlackBuild b/Slackware/i2p-base/i2p-base.SlackBuild index 1a5a254dcb..5b44e63ef8 100644 --- a/Slackware/i2p-base/i2p-base.SlackBuild +++ b/Slackware/i2p-base/i2p-base.SlackBuild @@ -21,7 +21,7 @@ CWD=$(pwd) TMP=/tmp PKG=/$TMP/package-base-i2p NAME=i2p-base -VERSION=0.0.3 +VERSION=0.0.4 BUILD=1sponge ARCH=noarch INSTALL_DIR=opt diff --git a/Slackware/i2p-base/rc.i2p_def b/Slackware/i2p-base/rc.i2p_def index c231922e5f..ef96415ba6 100644 --- a/Slackware/i2p-base/rc.i2p_def +++ b/Slackware/i2p-base/rc.i2p_def @@ -3,7 +3,7 @@ i2p_start() { # Check if router is up first! - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory status )" > /dev/null + /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'" > /dev/null if [ $? -eq 0 ] ; then { # I2p is already running, so tell the user. echo "I2P is already running..." @@ -14,13 +14,13 @@ i2p_start() { # Just in-case there are leftover junk in /tmp... rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping # Now that all junk is cleaned up, start. - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )" + /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory start )'" } fi } i2p_stop() { - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )" + /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory stop )'" rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping } @@ -31,15 +31,15 @@ i2p_restart() { } i2p_status() { - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory status )" + /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'" } i2p_console() { - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory console )" + /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory console )'" } i2p_dump() { - /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory dump )" + /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory dump )'" } case "$1" in -- GitLab