diff options
| author | EuAndreh <eu@euandre.org> | 2021-01-17 16:17:54 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-01-17 16:17:54 -0300 |
| commit | 98ce9eb4fdb41c11662ff13481b8d50188952237 (patch) | |
| tree | 6682f60eee3cf9577b15c9d9624c6b473b4e8548 | |
| parent | bashrc.sh: Stop generating ~/.spacemacs.env file (diff) | |
| download | dotfiles-98ce9eb4fdb41c11662ff13481b8d50188952237.tar.gz dotfiles-98ce9eb4fdb41c11662ff13481b8d50188952237.tar.xz | |
Stop generating ~/.bash.env, remove nix-search-update-job.sh
| -rw-r--r-- | bash/bashrc.sh | 2 | ||||
| -rw-r--r-- | bash/fake-symlinks.sh | 2 | ||||
| -rw-r--r-- | nixos/common.nix | 1 | ||||
| -rw-r--r-- | nixos/usurpador.nix | 1 | ||||
| -rwxr-xr-x | scripts/ad-hoc/nix-search-update.sh | 5 | ||||
| -rwxr-xr-x | scripts/cron/nix-search-update-job.sh | 31 |
6 files changed, 1 insertions, 41 deletions
diff --git a/bash/bashrc.sh b/bash/bashrc.sh index a3bef199..f00940c2 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -16,5 +16,3 @@ export DOTFILES=~/dev/libre/dotfiles . $DOTFILES/bash/symlinks.sh . "$HOME/annex/bin/misc/env.sh" . "$HOME/.nurc" - -export -p > ~/.bash.env diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index e70d5e22..160e3177 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -6,7 +6,7 @@ cp "${DOTFILES}/org.keepassxc.keepassxc_browser.json" ~/.mozilla/native-messagin pushd "${DOTFILES}/bash/templates/" > /dev/null || exit 1 export DOLLAR='$' -for job in report-summary annex elfeed backup copy-box-backups repo-update notmuch-dump mbox-archive nix-search-update mr-remotes-backup; do +for job in report-summary annex elfeed backup copy-box-backups repo-update notmuch-dump mbox-archive mr-remotes-backup; do sed "s/__JOB__/$job/" cronjob-with-email.sh > "$HOME/dev/libre/dotfiles/scripts/cron/${job}-job.sh" chmod +x "$HOME/dev/libre/dotfiles/scripts/ad-hoc/${job}.sh" chmod +x "$HOME/dev/libre/dotfiles/scripts/cron/${job}-job.sh" diff --git a/nixos/common.nix b/nixos/common.nix index 5c8aabcb..4e194dc8 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -18,7 +18,6 @@ let notmuch-dump-job = daily-at-12h30min; mbox-archive-job = daily-at-12h30min; copy-box-backups-job = daily-at-12h30min; - nix-search-update-job = daily-at-12h30min; mr-remotes-backup-job = daily-at-12h30min; }; priv-crons = { pacheco-job = "0 12 5 * *"; }; diff --git a/nixos/usurpador.nix b/nixos/usurpador.nix index 7b2b79c5..fbe2997c 100644 --- a/nixos/usurpador.nix +++ b/nixos/usurpador.nix @@ -22,7 +22,6 @@ in rec { common.crons.notmuch-dump-job common.crons.mbox-archive-job common.crons.copy-box-backups-job - common.crons.nix-search-update-job common.crons.mr-remotes-backup-job ]; } diff --git a/scripts/ad-hoc/nix-search-update.sh b/scripts/ad-hoc/nix-search-update.sh deleted file mode 100755 index 3c3b2216..00000000 --- a/scripts/ad-hoc/nix-search-update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -eux - -# shellcheck source=/dev/null -. ~/.bash.env -nix search -u lilypond # just a label so the cache can be updated diff --git a/scripts/cron/nix-search-update-job.sh b/scripts/cron/nix-search-update-job.sh deleted file mode 100755 index be4cd945..00000000 --- a/scripts/cron/nix-search-update-job.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -eux -LOG_FILE="$(mktemp)" -{ - finish() { - status=$? - if [ $status = 0 ]; then - STATUS="✅ SUCCESS (status $status)" - else - STATUS="❌ FAILURE (status $status)" - fi - - echo "Registering status locally..." - set -x - printf '%s nix-search-update\n' "$status" >> "/tmp/cron-dbg.summary.$(date -I).euandreh.log" - - echo "Sending report email..." - - SUBJECT="Job report on $(hostname): ${STATUS} for nix-search-update-job.sh" - gpg -easr eu@euandre.org < "$LOG_FILE" | \ - mail eu@euandre.org \ - -s "$SUBJECT" \ - -a 'From:eu@euandre.org' \ - --content-type 'text/plain; charset=utf-8' - echo 'Mail sent!' - } - trap finish EXIT - - echo "Starting: $(date -Is)" - ~/dev/libre/dotfiles/scripts/ad-hoc/nix-search-update.sh - echo "Finishing: $(date -Is)" -} | tee "$LOG_FILE" 2>&1 |
