dot

packages and services management
Log | Files | Refs | README

commit fe6b2a5d5933f7b51d953b9ea7249d9c29f70e80
parent 3894bac95040d300ab191f1d2d9da3a3c2b45dd5
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 31 Mar 2018 18:17:13 +0200

prepare quark for new virtual hosts

Diffstat:
M.profile | 4++--
Mbin/pack | 2+-
Mconfigure | 2--
Mpack/plan9/build | 2++
Apack/quark/build | 2++
Mpack/quark/config.h | 7+++----
Dpack/quark/configure | 1-
Muri/people | 1+
8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.profile b/.profile @@ -22,9 +22,9 @@ export PACK="$HOME/etc/pack" export PACKROOT="$HOME/.local" export LD_LIBRARY_PATH="$PACKROOT/lib" -export PLAN9="/usr/lib/plan9" +export PLAN9="$HOME/.local/src/plan9" -export PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin" +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin" export PATH="$PATH:/usr/X11R6/bin" export PATH="$HOME/etc/bin:$PACKROOT/bin:$PATH:$PLAN9/bin" diff --git a/bin/pack b/bin/pack @@ -53,7 +53,7 @@ case "$1" in [ -d "$PREFIX" ] || "$0" build "$2" || rm -r "$PREFIX" cd "$PREFIX" - find . -type d \ + find -L . -type d \ -exec sh -c 'mkdir -p "$PACKROOT/$0"' {} \; -o \ -exec sh -c 'ln -f "$PREFIX/$0" "$PACKROOT/$0"' {} \; ;; diff --git a/configure b/configure @@ -24,7 +24,5 @@ find .[!.]* \ -type f -exec sh -c "$symln" "$HOME" {} \; -o \ -type l -exec sh -c "$symln" "$HOME" {} \; -find -L "$HOME" -type l -exec rm {} + - ln -fs /mnt/key/enchive.pub "$HOME/.config/enchive/enchive.pub" ln -fs /mnt/key/enchive.sec "$HOME/.config/enchive/enchive.sec" diff --git a/pack/plan9/build b/pack/plan9/build @@ -1,3 +1,5 @@ #!/bin/sh -ex ./INSTALL + +mkdir -p "$PREFIX" diff --git a/pack/quark/build b/pack/quark/build @@ -0,0 +1 @@ +../build/make+ \ No newline at end of file diff --git a/pack/quark/config.h b/pack/quark/config.h @@ -20,10 +20,9 @@ static struct { regex_t re; } vhost[] = { /* canonical host host regex directory */ - { "nas.josuah.net", "^nas.josuah\\.net$", "." }, - { "josuah.net", "^josuah\\.net$", "." }, - { "git.josuah.net", "^git\\.josuah\\.net$", "git" }, - { "cyberia.systems", "^cyberia\\.systems", "cyb" }, + { "josuah.net", "josuah\\.net$", "josuah.net" }, + { "cyberia.systems", "cyberia\\.systems$", "cyberia.systems" }, + { "atelier-fu.fr", "atelier-fu\\.fr", "atelier-fu.fr" } }; /* mime-types */ diff --git a/pack/quark/configure b/pack/quark/configure @@ -1 +0,0 @@ -sudo setcap 'CAP_NET_BIND_SERVICE+ep' "$HOME/opt/quark/bin/quark" diff --git a/uri/people b/uri/people @@ -8,6 +8,7 @@ gopher://tx.god.jp gopher://z3bra.org http://code.dogmap.org http://fuwafuwa.moe +http://fydler.com/karahobny http://gnu.moe http://hosakacorp.net http://josuah.net