diff --git a/barrierc/run b/barrierc/run index c536d0a..786ed39 100755 --- a/barrierc/run +++ b/barrierc/run @@ -1,8 +1,10 @@ #!/bin/zsh -if [[ ! -e ${0:A:h}/server ]] then +export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config} +SERVER_FILE=${XDG_CONFIG_HOME}/barrier/server +if [[ ! -e $SERVER_FILE ]] then <<-ERROR Service requires configuration! - Create \`${0:A:h}/server\` containing the target server name + Create \`${SERVER_FILE}\` containing the target server name ERROR exit 1 fi @@ -10,4 +12,4 @@ source ${0:A:h:h}/import-env.zsh import-env awesome || exit 1 exec 2>&1 -exec barrierc --no-daemon $(<${0:A:h}/server) +exec barrierc --no-daemon $(<${SERVER_FILE}) diff --git a/barrierc/server b/barrierc/server deleted file mode 100644 index 84fe995..0000000 --- a/barrierc/server +++ /dev/null @@ -1 +0,0 @@ -gaminghorst diff --git a/barriers/run b/barriers/run index 7a496ae..0a37a48 100755 --- a/barriers/run +++ b/barriers/run @@ -1,5 +1,5 @@ #!/bin/zsh -source ${0:a:h:h}/import-env.zsh +source ${0:A:h:h}/import-env.zsh import-env awesome || exit 1 exec 2>&1