diff options
| author | EuAndreh <eu@euandre.org> | 2021-01-19 13:33:06 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-01-19 13:33:06 -0300 |
| commit | eb4420504a5232ba10f2f2f1ff8739eb8f80f90e (patch) | |
| tree | cb94afcc2257a0ed24fe0b7610dcdc4338e616b3 | |
| parent | bash/fzf.sh: Match history with command being run (diff) | |
| download | dotfiles-eb4420504a5232ba10f2f2f1ff8739eb8f80f90e.tar.gz dotfiles-eb4420504a5232ba10f2f2f1ff8739eb8f80f90e.tar.xz | |
Fix cronjob paths
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | bash/env.sh | 2 | ||||
| -rw-r--r-- | bash/fake-symlinks.sh | 8 | ||||
| -rw-r--r-- | nixos/common.nix | 31 |
4 files changed, 24 insertions, 19 deletions
@@ -1,2 +1,2 @@ /result -/cron/generated/ +/cron/*-job.sh diff --git a/bash/env.sh b/bash/env.sh index 019a1e2b..e759e620 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -13,4 +13,4 @@ export NIX_BUILD_CORES=0 export GUIX_PROFILE="$HOME/.guix-profile" export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" -PATH="$HOME/.local/bin:$HOME/tmp/bin:$HOME/dev/libre/others/dinheiros:$DOTFILES/scripts:$DOTFILES/xmonad/scripts:$HOME/annex/bin/scripts:$HOME/annex/bin/cron:$PATH" +PATH="$HOME/.local/bin:$HOME/tmp/bin:$HOME/dev/libre/others/dinheiros:$DOTFILES/scripts:$DOTFILES/xmonad/scripts:$HOME/annex/bin/scripts:$PATH" diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index 4dc78668..32719ccc 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -8,18 +8,18 @@ export DOLLAR='$' mkdir -p "$DOTFILES/cron/generated/" for job in report-summary annex elfeed backup copy-box-backups repo-update mbox-archive mr-remotes-backup; do - sed "s/__JOB__/$job/" cronjob-with-email.sh > "$HOME/dev/libre/dotfiles/cron/generated/${job}-job.sh" + sed "s/__JOB__/$job/" cronjob-with-email.sh > "$HOME/dev/libre/dotfiles/cron/${job}-job.sh" chmod +x "$HOME/dev/libre/dotfiles/cron/${job}.sh" - chmod +x "$HOME/dev/libre/dotfiles/cron/generated/${job}-job.sh" + chmod +x "$HOME/dev/libre/dotfiles/cron/${job}-job.sh" done mkdir -p "$HOME/annex/bin/cron/generated/" # shellcheck disable=2043 for job in pacheco; do prefix="$HOME/annex/bin/cron" - sed "s/__JOB__-job/$job-job/" cronjob-with-email.sh | sed "s|.*__JOB__.*|$prefix/$job.sh|" > "$HOME/annex/bin/cron/generated/${job}-job.sh" + sed "s/__JOB__-job/$job-job/" cronjob-with-email.sh | sed "s|.*__JOB__.*|$prefix/$job.sh|" > "$HOME/annex/bin/cron/${job}-job.sh" chmod +x "$HOME/annex/bin/cron/${job}.sh" - chmod +x "$HOME/annex/bin/cron/generated/${job}-job.sh" + chmod +x "$HOME/annex/bin/cron/${job}-job.sh" done mkdir -p ~/archive/torrent/ diff --git a/nixos/common.nix b/nixos/common.nix index 4e194dc8..3d39804f 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -5,24 +5,29 @@ let daily-at-12h30min = "30 12 * * *"; every-x-hours = "0 * * * *"; pub-crons = { - sync-mail = every-x-hours; - deliver-queued-mail = every-x-hours; - deliver-my-enqueued-emails = every-x-hours; + no-mail = { + sync-mail = every-x-hours; + deliver-queued-mail = every-x-hours; + deliver-my-enqueued-emails = every-x-hours; + }; - report-summary-job = "30 13 * * *"; + with-mail = { + report-summary-job = "30 13 * * *"; - annex-job = daily-at-12h30min; - elfeed-job = daily-at-12h30min; - backup-job = daily-at-12h30min; - repo-update-job = daily-at-12h30min; - notmuch-dump-job = daily-at-12h30min; - mbox-archive-job = daily-at-12h30min; - copy-box-backups-job = daily-at-12h30min; - mr-remotes-backup-job = daily-at-12h30min; + annex-job = daily-at-12h30min; + elfeed-job = daily-at-12h30min; + backup-job = daily-at-12h30min; + repo-update-job = daily-at-12h30min; + notmuch-dump-job = daily-at-12h30min; + mbox-archive-job = daily-at-12h30min; + copy-box-backups-job = daily-at-12h30min; + mr-remotes-backup-job = daily-at-12h30min; + }; }; priv-crons = { pacheco-job = "0 12 5 * *"; }; in { crons = builtins.mapAttrs - (cron-for-name "/home/andreh/dev/libre/dotfiles/scripts/cron") pub-crons + (cron-for-name "/home/andreh/dev/libre/dotfiles/cron") pub-crons.no-mail + // builtins.mapAttrs (cron-for-name "/home/andreh/dev/libre/dotfiles/cron/generated") pub-crons.with-mail // builtins.mapAttrs (cron-for-name "/home/andreh/annex/cron") priv-crons; } |