From 26125efbab17f6b33cfa781b9ef4ed5fd2474b4c Mon Sep 17 00:00:00 2001 From: anonimal <anonimal@i2pmail.org> Date: Sun, 1 Jan 2017 22:49:13 +0000 Subject: [PATCH 1/2] Kovri: commit first install script for makeself References monero-project/kovri#362 --- kovri/install.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 kovri/install.sh diff --git a/kovri/install.sh b/kovri/install.sh new file mode 100755 index 0000000..38b7600 --- /dev/null +++ b/kovri/install.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# TODO(unassigned): /bin/sh isn't smart enough + +# Trivial script to install binary/resources using the makeself installer +# Not to substitute real packaging (this is meant for nightly/branch-tip builds) + +case "$OSTYPE" in + linux*) + _data="$HOME/.kovri" + _path="$HOME/.bin" + ;; + darwin*) + _data="$HOME/Library/Application\ Support/Kovri" + _path="$HOME/Library/Desktop" + ;; + freebsd*) + _data="$HOME/.kovri" + _path="$HOME/bin" + ;; + msys) + _data="$APPDATA\\Kovri" + _path="$HOMEPATH\\Desktop" + ;; + *) + echo "Unsupported platform" + exit 1 + ;; +esac + +_backup="${_data}-$(date +%Y.%m.%d)" # TODO(anonimal): we'll probably want to backup using revision hash +_binary="kovri" + +# Create bin dir if needed +[ ! -d "$_path" ] && mkdir "$_path" + +# Create backup if needed +[ -d "$_data" ] && mv "$_data" "$_backup" && [ -f "${_path}/${_binary}" ] && mv "${_path}/${_binary}" "$_backup" + +# Move resources +mkdir "$_data" && mv $(ls -A . | grep -v $(basename "$0")) "$_data" && mv "${_data}/${_binary}" "$_path" + +if [ $? -eq 1 ]; then + echo "Failed to install. See above error messages" + exit 1 +fi + +echo "Kovri binary '$_binary' is in $_path" +echo "Consider adding $_path to your \$PATH" From 52462a826f9e04a3b75e7cf4458355e6986e284f Mon Sep 17 00:00:00 2001 From: anonimal <anonimal@i2pmail.org> Date: Sun, 1 Jan 2017 23:14:20 +0000 Subject: [PATCH 2/2] Kovri: fix data path for OSX + broaden sanity test References monero-project/kovri#362 --- kovri/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kovri/install.sh b/kovri/install.sh index 38b7600..12dd1b5 100755 --- a/kovri/install.sh +++ b/kovri/install.sh @@ -10,7 +10,7 @@ case "$OSTYPE" in _path="$HOME/.bin" ;; darwin*) - _data="$HOME/Library/Application\ Support/Kovri" + _data="$HOME/Library/Application Support/Kovri" _path="$HOME/Library/Desktop" ;; freebsd*) @@ -39,7 +39,7 @@ _binary="kovri" # Move resources mkdir "$_data" && mv $(ls -A . | grep -v $(basename "$0")) "$_data" && mv "${_data}/${_binary}" "$_path" -if [ $? -eq 1 ]; then +if [ $? -ne 0 ]; then echo "Failed to install. See above error messages" exit 1 fi