dot

packages and services management
Log | Files | Refs | README

commit 5809116c003f4578e418aed318b7bb59c089f0e8
parent 320afb002b28cfc4e7f142545294847365f38fae
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 14 Oct 2018 21:28:36 +0200

Merge branch 'master' of git.josuah.net:dotfiles

Diffstat:
Dbin/start-acme | 11-----------
Mconf-s6 | 5++---
Adot/mblaze/filter | 1+
Ddot/mblaze/filters | 1-
Ds6-base-contents | 2--
Ms6/git-mirror-snooze/data/mirror | 2+-
As6/git-mirror-snooze/env/GIT | 1+
Ms6/git-mirror-snooze/run | 20+++++++++++++++-----
8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/bin/start-acme b/bin/start-acme @@ -1,11 +0,0 @@ -#!/9/bin/rc - -if (test -f $home/acme.dump) - exec acme \ - -l $home/acme.dump \ - -f $PLAN9/font/pelm/unicode.8.font \ - -F $PLAN9/font/pelm/unicode.8.font $* -if not - exec acme \ - -f $PLAN9/font/pelm/unicode.8.font \ - -F $PLAN9/font/pelm/unicode.8.font $* diff --git a/conf-s6 b/conf-s6 @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh -ex # install configuration files with symlinks and clone bin cd "$(dirname "$0")" @@ -7,5 +7,4 @@ cp -RLf s6/s6-logger /var/s6 cp -RLf s6/ok-all /etc/s6 rm -rf /var/s6/s6-logger/fifo mkfifo /var/s6/s6-logger/fifo -touch /etc/s6/ok-all/contents -sort -u -o s6/ok-all/contents s6-base-contents /etc/s6/ok-all/contents +test -d /etc/s6/ok-all || cp -r s6/ok-all diff --git a/dot/mblaze/filter b/dot/mblaze/filter @@ -0,0 +1 @@ +application/octet-stream: gpg -d diff --git a/dot/mblaze/filters b/dot/mblaze/filters @@ -1 +0,0 @@ -application/pgp-encrypted: gpg -d diff --git a/s6-base-contents b/s6-base-contents @@ -1,2 +0,0 @@ -s6rc-fdholder -s6rc-oneshot-runner diff --git a/s6/git-mirror-snooze/data/mirror b/s6/git-mirror-snooze/data/mirror @@ -1,3 +1,3 @@ git://git.josuah.net/code git://git.josuah.net/dot -git://git.josuah.net/anvil +git://git.josuah.net/pk diff --git a/s6/git-mirror-snooze/env/GIT b/s6/git-mirror-snooze/env/GIT @@ -0,0 +1 @@ +/var/git diff --git a/s6/git-mirror-snooze/run b/s6/git-mirror-snooze/run @@ -1,8 +1,18 @@ -#!/bin/sh -e +#!/usr/bin/env execlineb -name=$(basename "$1" .git) +s6-envdir env +importas GIT GIT -test $# = 0 && exec echo 'usage: git mirror <repo-url>' -test -d "$name" || git clone --bare "$1" "$(basename "name" .git)" +foreground { + if { mkdir -p $GIT } + forbacktickx -n x { cat data/mirror } importas x x + backtick -n repo { basename $x .git } importas repo repo + if -n { test -d ${GIT}/${repo} } + if { git clone --bare ${x} ${GIT}/${repo} } + git -C ${GIT}/${repo} config remote.origin.fetch 'refs/heads/*:refs/heads/*' +} -git -C "$name" config remote.origin.fetch 'refs/heads/*:refs/heads/*' +snooze -H * -M /15 + +forbacktickx -n x { s6-ls ${GIT} } importas x x +git -C ${GIT}/${x} fetch --all --verbose