lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-07 08:02:56 +03:00
Code Activity

os400: fix shellcheck warnings in scripts (fixups)

Browse Source 
- Build scripts must be executed by the os/400 shell (sh), not bash which
  is a PASE program: The `-ot` non-POSIX test extension works in os/400 as
  well. Ref: https://github.com/libssh2/libssh2/pull/1364#issue-2241646754

- Drop/fixup mods trying to make some syntax highlighters happier.

Follow-up to c6625707b9 #1358
Assisted-by: Patrick Monnerat
Closes #1364
Closes #1366
This commit is contained in:
Viktor Szakats
2024-04-13 20:05:43 +00:00
parent 8788bb90a8
commit 81341e1e80
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
os400/config400.default
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Copyright (C) The libssh2 project and its contributors. # Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause

9
os400/initscript.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Copyright (C) The libssh2 project and its contributors. # Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
@@ -94,6 +94,7 @@ action_needed()
{ {
[ ! -e "${1}" ] && return 0 [ ! -e "${1}" ] && return 0
[ -n "${2}" ] || return 1 [ -n "${2}" ] || return 1
# shellcheck disable=SC3013
[ "${1}" -ot "${2}" ] && return 0 [ "${1}" -ot "${2}" ] && return 0
return 1 return 1
} }
@@ -121,8 +122,7 @@ canonicalize_path()
do IFS="${IFSSAVE}" do IFS="${IFSSAVE}"
case "${C}" in case "${C}" in
.) ;; .) ;;
..) R=$(expr \ ..) R="$(expr "${R}" : '^\(.*/\)..*')"
"${R}" : '^\(.*/\)..*')
;; ;;
?*) R="${R}${C}/" ?*) R="${R}${C}/"
;; ;;
@@ -147,8 +147,7 @@ make_module()
MODULES="${MODULES} ${1}" MODULES="${MODULES} ${1}"
MODIFSNAME="${LIBIFSNAME}/${1}.MODULE" MODIFSNAME="${LIBIFSNAME}/${1}.MODULE"
action_needed "${MODIFSNAME}" "${2}" || return 0; action_needed "${MODIFSNAME}" "${2}" || return 0;
SRCDIR="$(dirname \ SRCDIR="$(dirname "$(canonicalize_path "${2}")")"
"$(canonicalize_path "${2}")")"
# #pragma convert has to be in the source file itself, i.e. # #pragma convert has to be in the source file itself, i.e.
# putting it in an include file makes it only active # putting it in an include file makes it only active

2
os400/make-include.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Copyright (C) The libssh2 project and its contributors. # Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #

2
os400/make-rpg.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Copyright (C) The libssh2 project and its contributors. # Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #

2
os400/make-src.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Copyright (C) The libssh2 project and its contributors. # Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #

2
os400/make.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
# Copyright (C) The libssh2 project and its contributors. # Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #