From 5e5129e5114f1720432797072140110bd855edb2 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 28 Jun 2024 09:37:50 -0600 Subject: [PATCH] all: fmt --- bin/ci | 3 +-- bin/repair | 3 +-- bin/update-openssh | 14 +++++++------- common.sh | 2 +- pkgs/flake-warn.sh | 4 ++-- templates/mojo/thing.pl | 2 +- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/bin/ci b/bin/ci index ceaaa4a..545812e 100755 --- a/bin/ci +++ b/bin/ci @@ -47,7 +47,7 @@ if [ "${1}" = "update" ]; then git add pull_requests git commit -m 'watched: update watched pull requests' fi - + for inp in $(nix flake metadata --json | jq -r '.locks.nodes.root.inputs | keys[] as $k | $k'); do if ! git checkout -b "${ci_branch}_${inp}"; then handle_co_fail "${ci_branch}_${inp}" @@ -88,7 +88,6 @@ if [ "${1}" = "update" ]; then exit 1 fi - if ! git checkout main; then handle_co_fail exit 1 diff --git a/bin/repair b/bin/repair index a4c3d65..1cf513e 100755 --- a/bin/repair +++ b/bin/repair @@ -1,5 +1,4 @@ -#!/bin/sh - +#!/usr/bin/env bash while nix flake check --no-build |& grep "is not valid" >/tmp/invalid; do path=$(cat /tmp/invalid | awk -F\' '{print $2}') diff --git a/bin/update-openssh b/bin/update-openssh index 74ea956..4a45e11 100755 --- a/bin/update-openssh +++ b/bin/update-openssh @@ -20,15 +20,15 @@ CURRENT_COMMIT="$(echo $CURRENT | jq -r .rev)" if [ "${CURRENT_COMMIT}" != "${COMMIT}" ]; then nix-prefetch-github openssh openssh-portable \ --rev "${COMMIT}" \ - --json | \ + --json | jq -r --arg v "${UPDATED}" \ - --arg c "${COMMENT}" \ - '. |= . + {"version": $v, "comment": $c}' \ - > pkgs/openssh/version.json + --arg c "${COMMENT}" \ + '. |= . + {"version": $v, "comment": $c}' \ + >pkgs/openssh/version.json FN=$(mktemp) - echo "pkgs/openssh: update to '${COMMIT}'" > ${FN} - echo >> ${FN} - echo "${COMMENT}" >> ${FN} + echo "pkgs/openssh: update to '${COMMIT}'" >${FN} + echo >>${FN} + echo "${COMMENT}" >>${FN} git add pkgs/openssh/version.json && git commit -F $FN else echo "No updates." diff --git a/common.sh b/common.sh index 03978b6..47921e0 100644 --- a/common.sh +++ b/common.sh @@ -56,7 +56,7 @@ resolveAlias() { agentHasKey() { checkKey="$(echo $1 | awk '{print $NF}')" for i in $AgentKeys; do - if [[ "$i" == $checkKey ]]; then + if [[ $i == $checkKey ]]; then return 0 fi done diff --git a/pkgs/flake-warn.sh b/pkgs/flake-warn.sh index 3cc9676..300ae40 100644 --- a/pkgs/flake-warn.sh +++ b/pkgs/flake-warn.sh @@ -9,10 +9,10 @@ NORMAL=$(tput sgr0) FLAKE_EPOCH=$(@nix@/bin/nix flake metadata --json | @jq@/bin/jq .lastModified) NOW_EPOCH=$(@coreutils@/bin/date +"%s") -EPOCH_DIFF=$(($NOW_EPOCH - $FLAKE_EPOCH)) +EPOCH_DIFF=$((NOW_EPOCH - FLAKE_EPOCH)) if [ $EPOCH_DIFF -gt $((60480 * 5)) ]; then echo - echo "${BOLD}WARNING: inputs haven't been updated in $(($EPOCH_DIFF / 86400)) days!${NORMAL}" + echo "${BOLD}WARNING: inputs haven't been updated in $((EPOCH_DIFF / 86400)) days!${NORMAL}" echo fi diff --git a/templates/mojo/thing.pl b/templates/mojo/thing.pl index e9a8ccf..b0fb01b 100644 --- a/templates/mojo/thing.pl +++ b/templates/mojo/thing.pl @@ -8,7 +8,7 @@ use 5.10.0; use Mojolicious::Lite -signatures; get '/' => sub ($c) { - $c->render(text => 'Hello Thing!'); + $c->render( text => 'Hello Thing!' ); }; app->start;