diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | chromium-i2p.sh | 10 | ||||
-rw-r--r-- | i2p.tmpfiles | 1 | ||||
-rw-r--r-- | i2prouter.sh | 59 |
5 files changed, 37 insertions, 51 deletions
@@ -22,16 +22,18 @@ pkgbase = i2p source = router.config source = i2prouter.bash source = i2prouter.sh + source = chromium-i2p.sh source = upstream-fixes.patch::https://github.com/i2p/i2p.i2p/compare/f2f29d6...cad3c46.patch validpgpkeys = 2D3D2D03910C6504C1210C65EE60C0C8EE7256A8 sha256sums = 9f03a636e2dc7e25455fb75869b3a8313fd177d231e056b0556159efec4d6d9d sha256sums = SKIP sha256sums = 644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876 - sha256sums = df26da04c8415ac24ec73b0dd08d3459a8964553bb77e5da5ab9833b0a31d865 + sha256sums = fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3 sha256sums = 5d134ee5bc614b54ec48de7c5214f6dbe08abcfab7d286c5b1c7616e39b478ed sha256sums = 7a4688db826c3dddb762976cd8c9a5d465255c3577069243d8e5af941a4126e2 sha256sums = 7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a - sha256sums = b5f1a5bb354552acebe2857b9579410f7fd589f2f7d6b12fbbfe4127a2d33fd8 + sha256sums = 8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5 + sha256sums = 77e359cf880ccc09f504372ef85c8ad3ab7d1186106a4ae92c4ff4f37ae650e0 sha256sums = ad7cf01d7fcc7107dc3360ad4b3f488cdcf2bab64c7d271d2ced89c2f942f613 pkgname = i2p @@ -34,19 +34,19 @@ source=("${_url}/i2psource_${pkgver}.tar.bz2"{,.sig} sha256sums=('9f03a636e2dc7e25455fb75869b3a8313fd177d231e056b0556159efec4d6d9d' 'SKIP' '644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876' - 'df26da04c8415ac24ec73b0dd08d3459a8964553bb77e5da5ab9833b0a31d865' + 'fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3' '5d134ee5bc614b54ec48de7c5214f6dbe08abcfab7d286c5b1c7616e39b478ed' '7a4688db826c3dddb762976cd8c9a5d465255c3577069243d8e5af941a4126e2' '7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a' - 'b5f1a5bb354552acebe2857b9579410f7fd589f2f7d6b12fbbfe4127a2d33fd8' - '2d5ae5f5379e6ea095bb30c374b493b1fdd47b06aa536760c6c73bb062eb6eef' + '8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5' + '77e359cf880ccc09f504372ef85c8ad3ab7d1186106a4ae92c4ff4f37ae650e0' 'ad7cf01d7fcc7107dc3360ad4b3f488cdcf2bab64c7d271d2ced89c2f942f613') prepare() { cd "$pkgname-$pkgver" - sed 's|BUILD = 1|BUILD = 0|' -i ../upstream-fixes.patch + sed -i ../upstream-fixes.patch \ + -e 's|BUILD = 1|BUILD = 0|' patch -Np1 -i ../upstream-fixes.patch - #patch -Np0 -i $startdir/clock-tuning.patch } build() { @@ -75,7 +75,7 @@ package() { install -Dm644 "$srcdir/router.config" "opt/i2p/router.config" install -Dm644 "$srcdir/wrapper.config" "opt/i2p/wrapper.config" - install -Dm755 "$srcdir/i2prouter.sh" "opt/i2p/i2prouter" + install -Dm754 "$srcdir/i2prouter.sh" "opt/i2p/i2prouter" install -Dm755 "$srcdir/chromium-i2p.sh" "opt/i2p/scripts/chromium-i2p" install -Dm644 "$srcdir/i2prouter.bash" "usr/share/bash-completion/completions/i2prouter" diff --git a/chromium-i2p.sh b/chromium-i2p.sh index e9a9181fcccd..35c9b226c5a3 100644 --- a/chromium-i2p.sh +++ b/chromium-i2p.sh @@ -1,11 +1,11 @@ - #!/usr/bin/env bash +#!/usr/bin/env bash set -e DATADIR=${XDG_CONFIG_HOME:-$HOME/.config}/chromium-i2p [[ ! -f $DATADIR/.config ]] && { echo "creating config..." - install -dm700 $DATADIR + install -dm700 "$DATADIR" cat <<< ' CACHEDIR=/dev/shm/chromium-i2p # store in ram, or #CACHEDIR=$DATADIR/.tmp # keep on disk @@ -15,11 +15,11 @@ INCOGNITO=--incognito # comment out if you wish to have # urlhistory, passwords, etc. saved PROXY=127.0.0.1:4444 CONSOLE=127.0.0.1:7657 -' >$DATADIR/.config +' >"$DATADIR/.config" echo "$DATADIR/.config" } -source $DATADIR/.config +source "$DATADIR/.config" /usr/bin/chromium "$INCOGNITO" \ --user-data-dir="$DATADIR" \ @@ -55,4 +55,4 @@ source $DATADIR/.config --no-report-upload \ --site-per-process \ --use-fake-device-for-media-stream \ - ${@:-$CONSOLE} + "${@:-$CONSOLE}" diff --git a/i2p.tmpfiles b/i2p.tmpfiles index 15085d2b2d37..3e0d7985311f 100644 --- a/i2p.tmpfiles +++ b/i2p.tmpfiles @@ -2,3 +2,4 @@ d /run/i2p 0700 i2p i2p d /opt/i2p 0755 i2p i2p d /opt/i2p/.i2p 0700 i2p i2p d /opt/i2p/.tmp 0700 i2p i2p +f /opt/i2p/i2prouter 0754 root i2p diff --git a/i2prouter.sh b/i2prouter.sh index f4e7ac9a411d..3ab76a88aa4f 100644 --- a/i2prouter.sh +++ b/i2prouter.sh @@ -19,22 +19,19 @@ debug() { check_user() { if [[ "$(id -un)" != "$I2P_USER" ]]; then #debug "current user: $(id -un) dropping to user: $I2P_USER" - #chmod 700 /opt/i2p/.{i2p,tmp} - SCRIPT_PATH="$(cd $(dirname $0) && pwd)/$(basename $0)" + SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)/$(basename $0)" su - "$I2P_USER" -c "${SCRIPT_PATH} $@" exit $? fi } init_vars() { + [[ "$EUID" -eq 0 ]] && + fail "Attempting to start as root! You should never see this message, please report it" [[ ! -r "$WRAPPER_CONF" ]] && fail "Unable to read \$WRAPPER_CONF: ${WRAPPER_CONF}" [[ ! -x "$WRAPPER_CMD" ]] && fail "Unable to find or execute \$WRAPPER_CMD: ${WRAPPER_CMD}" - [[ ! $(grep -E ^I2P_USER $0) && "$EUID" = "0" ]] && - fail "Attempting to start as root! Please edit $(basename $0) and set the variable \$I2P_USER" - [[ "$(id -un "$I2P_USER")" != "$I2P_USER" ]] && - fail "\$I2P_USER does not exist: $I2P_USER" COMMAND_LINE="\"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"i2prouter\" wrapper.name=\"i2prouter\" TZ=UTC" } @@ -58,7 +55,7 @@ check_if_running() { rm -f "$PIDFILE" fi else - [[ "$pid" != "$(get_pid)" ]] && + [[ "$pid" -ne "$(get_pid)" ]] && fail "\$PIDFILE $PIDFILE differs from what is actually running!" fi else @@ -70,8 +67,7 @@ check_if_running() { _console() { if [[ ! "$pid" ]]; then trap '' INT QUIT - eval $COMMAND_LINE - [[ $? != 0 ]] && fail "Failed to launch the wrapper!" + eval "$COMMAND_LINE" || fail "Failed to launch the wrapper!" else echo "I2P Router is already running! (pid: $pid)" fi @@ -81,17 +77,16 @@ _start() { if [[ ! "$pid" ]]; then echo -n "Starting I2P Router" COMMAND_LINE+=" wrapper.daemonize=TRUE" - eval $COMMAND_LINE - [[ $? != 0 ]] && fail "Failed to launch the wrapper!" + eval "$COMMAND_LINE" || fail "Failed to launch the wrapper!" i=0 - while [[ ! "$pid" || $i < $TIMEOUT ]]; do + while [[ ! "$pid" || $i -lt $TIMEOUT ]]; do echo -n "." sleep 1 check_if_running ((i++)) done [[ $(get_pid) ]] && - echo " done (pid $pid)" || fail "timeout: Failed to start wrapper!" + echo " done" || fail "timeout: Failed to start wrapper!" else echo "I2P Router is already running! (pid: $pid)" fi @@ -99,27 +94,22 @@ _start() { _restart() { [[ "$pid" ]] && - kill -USR1 $(get_wrapper_pid) || echo "I2P Router is not running" + kill -USR1 "$(get_wrapper_pid)" || echo "I2P Router is not running" } _stop() { if [[ "$pid" ]]; then echo -n "Hard shutdown initiated" - kill -TERM "$pid" - [[ $? != 0 ]] && fail "Unable to stop I2P Router: kill -TERM $pid" + kill -TERM "$pid" || fail "Unable to stop I2P Router: kill -TERM $pid" i=0 - while [[ "$pid" || $i > $TIMEOUT ]]; do + while [[ "$pid" || $i -gt $TIMEOUT ]]; do echo -n "." sleep 1 [[ ! $(get_pid) ]] && unset pid ((i++)) done - if [[ "$pid" ]]; then - fail "timeout: Failed to stop wrapper! (pid: $pid)" - else - echo " done" - [[ "$1" = 'start' ]] && _start - fi + [[ "$pid" ]] && + fail "timeout: Failed to stop wrapper! (pid: $pid)" || echo " done" else echo "I2P Router is not running." fi @@ -128,20 +118,16 @@ _stop() { _graceful() { if [[ "$pid" ]]; then echo -n "Graceful shutdown initiated" - kill -HUP "$pid" - [[ $? != 0 ]] && fail "Unable to stop I2P Router." + kill -HUP "$pid" || fail "Unable to stop I2P Router." i=0 - while [[ "$pid" || $i > 660 ]]; do + while [[ "$pid" || $i -gt 660 ]]; do echo -n "." sleep 1 [[ ! $(get_pid) ]] && unset pid ((i++)) done - if [[ "$pid" ]]; then - fail "timeout: Took longer than 10m to stop. (pid: $pid)" - else - echo " done" - fi + [[ "$pid" ]] && + fail "timeout: Took longer than 10m to stop. (pid: $pid)" || echo " done" else echo "I2P Router is not running." fi @@ -149,10 +135,8 @@ _graceful() { _dump() { if [[ "$pid" ]]; then - echo "Dumping threads..." - kill -QUIT "$pid" - [[ $? != 0 ]] && - fail "Failed to dump threads" || echo "Thread Dump is available in wrapper.log" + kill -QUIT "$pid" || fail "Failed to dump threads" + echo "Thread Dump is available in wrapper.log" else echo "I2P Router is not running." fi @@ -160,15 +144,14 @@ _dump() { #----------------------------------------------------------------------------- [[ "$1" != @(console|start|stop|graceful|restart|dump) ]] && { - echo "Usage: $(basename $0) [command]" - echo + echo "Usage: $(basename $0) <command>" echo "Commands:" echo " console Launch in the current console" echo " start Start in the background as a daemon process" echo " stop Stop if running as a daemon or in another console" echo " graceful Stop gracefully, may take up to 11 minutes for all tunnels to close" echo " restart Restart the JVM" - echo " dump Request a Java thread dump if running" + echo " dump Request a Java thread dump" exit } |