From a80a43953e1506fcd074912ff183e629b1a89e2007b794462d120fc10c34f505 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 18 Apr 2025 10:54:35 +0300 Subject: [PATCH] Place positional parameters first --- contrib/go-debash/v0 | 2 +- contrib/go-debash/v1 | 2 +- master/bin/ctr-get | 2 +- slave/bin/steps-runner | 2 +- slave/bin/task-taker | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/go-debash/v0 b/contrib/go-debash/v0 index ee59db3..170f8ee 100755 --- a/contrib/go-debash/v0 +++ b/contrib/go-debash/v0 @@ -1,6 +1,6 @@ #!/bin/sh -find src -name "*.bash" -maxdepth 2 -exec perl -i -npe " +find src -maxdepth 2 -name "*.bash" -exec perl -i -npe " s%^#!/usr/bin/env bash%#!/bin/sh%; s%^#!/bin/bash%#!/bin/sh%; s%^bash %sh %; diff --git a/contrib/go-debash/v1 b/contrib/go-debash/v1 index 0e5e9de..9251848 100755 --- a/contrib/go-debash/v1 +++ b/contrib/go-debash/v1 @@ -1,6 +1,6 @@ #!/bin/sh -find src -name "*.bash" -maxdepth 2 -exec perl -i -npe " +find src -maxdepth 2 -name "*.bash" -exec perl -i -npe " s%^#!/usr/bin/env bash%#!/bin/sh%; s%^#!/bin/bash%#!/bin/sh%; s%^bash %sh %; diff --git a/master/bin/ctr-get b/master/bin/ctr-get index 771d46f..8038b82 100755 --- a/master/bin/ctr-get +++ b/master/bin/ctr-get @@ -17,7 +17,7 @@ sname="$0" . $BASS_ROOT/lib/rc cd ${1:-$TASKS/ctr} finder() { - find . -type d -mindepth 1 | sed "s/^..//" | sort -n + find . -mindepth 1 -type d | sed "s/^..//" | sort -n } ctrs=$(finder) diff --git a/slave/bin/steps-runner b/slave/bin/steps-runner index 09171a2..d79f049 100755 --- a/slave/bin/steps-runner +++ b/slave/bin/steps-runner @@ -25,7 +25,7 @@ LINE_TIMEOUT=600 mkdir $BASS_JOB/steps mkfifo step.finished step.stdout step.stderr -find . -type f -maxdepth 1 | sort | while read step ; do +find . -maxdepth 1 -type f | sort | while read step ; do step=${step#./} echo Running $step... mkdir $BASS_JOB/steps/$step diff --git a/slave/bin/task-taker b/slave/bin/task-taker index 90912e2..c4b046f 100755 --- a/slave/bin/task-taker +++ b/slave/bin/task-taker @@ -33,7 +33,7 @@ fi LASTNUM=$(realpath $LASTNUM) cd $TASKS/cur -find . -type d -mindepth 1 -maxdepth 1 | +find . -mindepth 1 -maxdepth 1 -type d | while read task ; do echo ${task#./} ; done | sort -n | while read task ; do -- 2.48.1