diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/athenet-apt-add (renamed from bin/athena-apt-add) | 6 | ||||
| -rwxr-xr-x | bin/buildssrht-preupload | 2 | ||||
| -rwxr-xr-x | bin/doccheckin | 4 | ||||
| -rwxr-xr-x | bin/locmaint | 11 | ||||
| -rwxr-xr-x | bin/reprepro-rebuilder | 5 |
5 files changed, 15 insertions, 13 deletions
diff --git a/bin/athena-apt-add b/bin/athenet-apt-add index 0346fa54..d3784b94 100755 --- a/bin/athena-apt-add +++ b/bin/athenet-apt-add @@ -7,8 +7,8 @@ set -e changes="$(readlink -f $1)" dist="$(grep ^Distribution: $changes | cut -d \ -f2)" -if ! [ -d "$HOME/lib/athena-apt" ]; then - echo >&2 "athena-apt annex not checked out" +if ! [ -d "$HOME/lib/athenet-apt" ]; then + echo >&2 "athenet-apt annex not checked out" exit 1 fi if ! [ -f "$changes" ]; then @@ -18,6 +18,6 @@ fi changestool "$changes" includeallsources || true ( - cd "$HOME/lib/athena-apt" + cd "$HOME/lib/athenet-apt" reprepro include "$dist" "$changes" ) diff --git a/bin/buildssrht-preupload b/bin/buildssrht-preupload index ebae98f2..c39eebce 100755 --- a/bin/buildssrht-preupload +++ b/bin/buildssrht-preupload @@ -101,7 +101,7 @@ $manifest->{tasks} = [ [ build => [ "cd $source", - "dgit --quilt=$quilt sbuild -d $dist --no-run-lintian" + "dgit --quilt=$quilt sbuild -d $dist" ] ], [lintian => ["lintian $changes"]], diff --git a/bin/doccheckin b/bin/doccheckin index 7c09e819..fe2553e5 100755 --- a/bin/doccheckin +++ b/bin/doccheckin @@ -19,8 +19,8 @@ git add howm/*.org howm/*/*.org archive/howm/archive.org \ papers/*.org papers/*.md papers/*.bib \ newpapers/*/*.org \ dissert/*.md pres/*.md letters/*.tex \ - howm/.howm-keys emacs-abbrevs emacs-bookmarks \ - News/*.SCORE emacs-diary archive/emacs-diary-* \ + howm/.howm-keys abbrevs bookmarks \ + News/*.SCORE diary archive/diary-* \ || true # this command should never fail and stop mr diff --git a/bin/locmaint b/bin/locmaint index 9c170511..9bdce9ef 100755 --- a/bin/locmaint +++ b/bin/locmaint @@ -106,7 +106,7 @@ our @remote_annexes = ( { origin => "athenag:annex.git", homedir => "lib/annex", lazy => 1 }, { origin => "athenag:annex19.git", homedir => "annex" }, { origin => "athenag:libpriv.git", homedir => "lib/priv" }, - { origin => "athena:wikiannex", homedir => "lib/wikiannex" }, + { origin => "git@git.spwhitton.name:wikiannex", homedir => "lib/wikiannex" }, { origin => "athenap:athpriv", homedir => "src/athpriv", synconlyannex => 1 }); for (getpwuid($<) . '@' . `hostname -f`) { @@ -394,15 +394,16 @@ sub do_coldbkup { # point, to grab metadata non-recursively } - # athena main repos - mkdir catfile($gitbk, "athena"); # compat dirname + # git.spwhitton.name main repos + mkdir catfile($gitbk, "athena"); # use 'athena' for backup drive compat my @athena_repos = map { if (m|^/srv/git/repositories/priv/(.+)\.git$|) { { uri => "athenap:$1", dir => "priv/$1.git" } } elsif (m|^/srv/git/repositories/(.+)\.git$|) { { uri => "athena:$1", dir => "$1.git" } } - } `ssh demeter find /srv/git/repositories -name "*.git" -type d 2>/dev/null`; + } `ssh spwhitton\@git.spwhitton.name\\ + find /srv/git/repositories -name "*.git" -type d 2>/dev/null`; backup_repo($_->{uri}, catfile($gitbk, "athena", $_->{dir})) for @athena_repos; @@ -410,7 +411,7 @@ sub do_coldbkup { mkdir catfile($gitbk, "athena_gcrypt"); my @gcrypt_repos = map { m|^local/gcrypt/(.+)$|; { uri => "athenag:$1", dir => "$1" } } - `ssh athena find local/gcrypt -name "*.git" -type d`; + `ssh spwhitton\@athena find local/gcrypt -name "*.git" -type d`; chomp @gcrypt_repos; backup_repo($_->{uri}, catfile($gitbk, "athena_gcrypt", $_->{dir})) for @gcrypt_repos; diff --git a/bin/reprepro-rebuilder b/bin/reprepro-rebuilder index 4007b0ed..354cd52f 100755 --- a/bin/reprepro-rebuilder +++ b/bin/reprepro-rebuilder @@ -33,7 +33,7 @@ use Getopt::Long; use Term::UI; use File::chdir; -our $repo = "$ENV{HOME}/lib/athena-apt"; +our $repo = "$ENV{HOME}/lib/athenet-apt"; our $prefix = "athena"; our @dists = qw(bookworm bookworm-backports unstable experimental); our $bpo_dist = "bookworm-backports"; @@ -186,7 +186,8 @@ sub build { my $build_debs = sub { my %opts = shift->%*; - my @args = ("--no-run-lintian", "-d", $dist); + my @args = ("--no-run-piuparts", "--no-run-lintian", + "--no-run-autopkgtest", "-d", $dist); push @args, $opts{all} ? "--arch-all" : "--no-arch-all"; for (@_) { no autodie; |