1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
From 6ba2b1e7c7c07e34b001a2b9ef5e54457a470c04 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 2 Apr 2025 07:11:12 +0200
Subject: [PATCH] Fix shell syntax errors reported by lintian
---
src/services/a-rex/lrms/boinc/cancel-boinc-job.in | 2 +-
src/services/a-rex/lrms/boinc/scan-boinc-job.in | 2 +-
src/services/a-rex/lrms/fork/cancel-fork-job.in | 2 +-
src/services/a-rex/lrms/fork/scan-fork-job.in | 2 +-
src/services/a-rex/lrms/ll/scan-ll-job.in | 6 +++---
src/services/a-rex/lrms/lsf/scan-lsf-job.in | 2 +-
src/services/a-rex/lrms/sge/scan-sge-job.in | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/services/a-rex/lrms/boinc/cancel-boinc-job.in b/src/services/a-rex/lrms/boinc/cancel-boinc-job.in
index dde139928..0846f1f0f 100644
--- a/src/services/a-rex/lrms/boinc/cancel-boinc-job.in
+++ b/src/services/a-rex/lrms/boinc/cancel-boinc-job.in
@@ -47,7 +47,7 @@ if [ -z "$joboption_controldir" ] ; then
fi
if [ -z "$joboption_gridid" ] ; then
- joboption_gridid=`echo "$GRAMI_FILE" | sed 's/.*\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/grami$/\1\2\3\4/'
+ joboption_gridid=`echo "$GRAMI_FILE" | sed 's/.*\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/grami$/\1\2\3\4/'`
fi
job_control_dir="$joboption_controldir"
diff --git a/src/services/a-rex/lrms/boinc/scan-boinc-job.in b/src/services/a-rex/lrms/boinc/scan-boinc-job.in
index 8df767c22..e63827c62 100644
--- a/src/services/a-rex/lrms/boinc/scan-boinc-job.in
+++ b/src/services/a-rex/lrms/boinc/scan-boinc-job.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Periodically monitor for jobs which has finished or failed but not
# reported an exitcode
diff --git a/src/services/a-rex/lrms/fork/cancel-fork-job.in b/src/services/a-rex/lrms/fork/cancel-fork-job.in
index 4a37a9fc2..b5e1fb7e4 100644
--- a/src/services/a-rex/lrms/fork/cancel-fork-job.in
+++ b/src/services/a-rex/lrms/fork/cancel-fork-job.in
@@ -46,7 +46,7 @@ if [ -z "$joboption_controldir" ] ; then
fi
fi
if [ -z "$joboption_gridid" ] ; then
- joboption_gridid=`echo "$GRAMI_FILE" | sed 's/.*\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/grami$/\1\2\3\4/'
+ joboption_gridid=`echo "$GRAMI_FILE" | sed 's/.*\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/\([^\/]*\)\/grami$/\1\2\3\4/'`
fi
job_control_dir="$joboption_controldir"
diff --git a/src/services/a-rex/lrms/fork/scan-fork-job.in b/src/services/a-rex/lrms/fork/scan-fork-job.in
index a1306f017..0b5a9921f 100644
--- a/src/services/a-rex/lrms/fork/scan-fork-job.in
+++ b/src/services/a-rex/lrms/fork/scan-fork-job.in
@@ -1,4 +1,4 @@
-#!@posix_shell@
+#!/bin/bash
#
# Periodically monitor for jobs which has finished or failed but not
# reported an exitcode
diff --git a/src/services/a-rex/lrms/ll/scan-ll-job.in b/src/services/a-rex/lrms/ll/scan-ll-job.in
index 3a37c0d31..7abf052f2 100644
--- a/src/services/a-rex/lrms/ll/scan-ll-job.in
+++ b/src/services/a-rex/lrms/ll/scan-ll-job.in
@@ -157,10 +157,10 @@ do
continue
fi
numelem=$((numelem+1))
- donefile=$(control_path "${control_dir}" "${jobid}" "lrms_done"
+ donefile=$(control_path "${control_dir}" "${jobid}" "lrms_done")
statusfile="${control_dir}/processing/${jobid}.status"
- jobfile=$(control_path "${control_dir}" "${jobid}" "local"
- errorsfile=$(control_path "${control_dir}" "${jobid}" "errors"
+ jobfile=$(control_path "${control_dir}" "${jobid}" "local")
+ errorsfile=$(control_path "${control_dir}" "${jobid}" "errors")
# Continue if the job is already flagged as done?
test -f "$donefile" && continue
diff --git a/src/services/a-rex/lrms/lsf/scan-lsf-job.in b/src/services/a-rex/lrms/lsf/scan-lsf-job.in
index 255beee54..f4cdfd3c9 100644
--- a/src/services/a-rex/lrms/lsf/scan-lsf-job.in
+++ b/src/services/a-rex/lrms/lsf/scan-lsf-job.in
@@ -124,7 +124,7 @@ for ctr_dir in $control_dir ; do
gridid=""
for gid in $gridids; do
grep "^localid=$id" $(control_path "${ctr_dir}" "$gid" "local") 2>/dev/null 1>/dev/null
- if [ $? -eq '1' ] ; do
+ if [ $? -eq '1' ] ; then
gridid="$gid"
break
fi
diff --git a/src/services/a-rex/lrms/sge/scan-sge-job.in b/src/services/a-rex/lrms/sge/scan-sge-job.in
index 85103f51c..5e2ae4c36 100644
--- a/src/services/a-rex/lrms/sge/scan-sge-job.in
+++ b/src/services/a-rex/lrms/sge/scan-sge-job.in
@@ -436,7 +436,7 @@ for ctr_dir in $control_dirs ; do
countfile=$(control_path "${ctr_dir}" "${gridid}" "lrms_job")
failedfile=$(control_path "${ctr_dir}" "${gridid}" "failed")
errorsfile=$(control_path "${ctr_dir}" "${gridid}" "errors")
- localfile="$(control_path ${ctr_dir}" "${gridid}" "local")
+ localfile=$(control_path "${ctr_dir}" "${gridid}" "local")
xmlfile=$(control_path "${ctr_dir}" "${gridid}" "xml")
if [ -f "$donefile" ] ; then continue ; fi
statusfile="${ctr_dir}/processing/${gridid}.status"
--
2.49.0
|
