use_xpub was not saved in config and fixed startup on OSX

This commit is contained in:
kexkey
2018-12-18 17:12:20 -05:00
parent a338d17fc7
commit 08a683266e
2 changed files with 14 additions and 4 deletions

View File

@@ -56,7 +56,7 @@ module.exports = {
{
type: 'confirm',
name: 'use_xpub',
default: utils._getDefault( 'want_xpub' )||false,
default: utils._getDefault( 'use_xpub' )||false,
message: prefix()+'Use an xpub key to watch or generate adresses?'+utils._getHelp('use_xpub'),
},
{
@@ -85,4 +85,4 @@ module.exports = {
templates: function( props ) {
return [];
}
};
};

View File

@@ -1,7 +1,17 @@
#!/bin/sh
# run as user <%= username %>
export USER=$(id -u <%= run_as_different_user?username:default_username %>):$(id -g <%= run_as_different_user?username:default_username %>)
<% if (run_as_different_user) { %>
OS=$(uname -s)
if [ "$OS" = "Darwin" ]; then
printf "\r\n\033[0;91m'Run as another user' feature is not supported on OSX. User <%= default_username %> will be used to run Cyphernode.\033[0m\r\n\r\n"
export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
else
export USER=$(id -u <%= username %>):$(id -g <%= username %>)
fi
<% } else { %>
export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
<% } %>
export ARCH=$(uname -m)
current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"