Skip to content

Commit 494e47a

Browse files
authored
style(upgrade): rewrite for X in $(find ...) as a glob loop (SC2044) (#654)
#### Short description of what this resolves: Next slice of ShellCheck cleanup (follow-up to #459, #643, #649, #652). Clears all 18 SC2044 warnings across the `fsupgrade-{2..8}.sh` family, and brings the family's outer-loop structure into line with what #652 landed on `fsupgrade-1.sh`. Every file has two loops of the form: ```sh for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do ``` Word-splitting the output of `find` is fragile — any whitespace or glob characters in a site directory name breaks the loop. Replace with a POSIX directory-glob: ```sh for dir in /var/www/localhost/htdocs/openemr/sites/*/; do dir="${dir%/}" sitename=${dir##*/} ...existing body unchanged... done ``` - Trailing `/` on the glob restricts matches to directories (same as `-type d`). - `dir="${dir%/}"` strips the trailing slash so `${dir}` inside the loop body behaves exactly as before — no follow-up changes needed. - `${dir##*/}` replaces `$(basename "${dir}")` — no subshell, same result. No `[ -d "${dir}" ] || continue` guard: the trailing-slash glob only expands to directories, so the guard is dead weight. (Matches the convention #652 landed on `fsupgrade-1.sh`.) Same fix applied to the `dirdata` loop in each file. Loop bodies are otherwise untouched. #### Changes proposed in this pull request: - `docker/openemr/7.0.4/upgrade/fsupgrade-{2,3,4,5,6,7,8}.sh` - `docker/openemr/8.0.0/upgrade/fsupgrade-{8,9}.sh` SC2044 in `fsupgrade-1.sh` was already handled by #652. `shellcheck --check-sourced --external-sources` is clean on all nine files. #### AI disclosure: - [x] Yes, I used AI to help with this PR
1 parent 35c7b4b commit 494e47a

9 files changed

Lines changed: 54 additions & 36 deletions

File tree

docker/openemr/7.0.4/upgrade/fsupgrade-2.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="5.0.2"
66
echo "Start: Upgrade to docker-version 2"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/7.0.4/upgrade/fsupgrade-3.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="6.0.0"
66
echo "Start: Upgrade to docker-version 3"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/7.0.4/upgrade/fsupgrade-4.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="6.1.0"
66
echo "Start: Upgrade to docker-version 4"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/7.0.4/upgrade/fsupgrade-5.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="7.0.0"
66
echo "Start: Upgrade to docker-version 5"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/7.0.4/upgrade/fsupgrade-6.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="7.0.1"
66
echo "Start: Upgrade to docker-version 6"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/7.0.4/upgrade/fsupgrade-7.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="7.0.2"
66
echo "Start: Upgrade to docker-version 7"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/7.0.4/upgrade/fsupgrade-8.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="7.0.3"
66
echo "Start: Upgrade to docker-version 8"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/8.0.0/upgrade/fsupgrade-8.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="7.0.3"
66
echo "Start: Upgrade to docker-version 8"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

docker/openemr/8.0.0/upgrade/fsupgrade-9.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ priorOpenemrVersion="7.0.4"
66
echo "Start: Upgrade to docker-version 9"
77

88
# Perform codebase upgrade on each directory in sites/
9-
for dir in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
10-
sitename=$(basename "${dir}")
9+
for dir in /var/www/localhost/htdocs/openemr/sites/*/; do
10+
dir="${dir%/}"
11+
sitename=${dir##*/}
1112

1213
# Ensure have all directories
1314
echo "Start: Ensure have all directories in ${sitename}"
@@ -39,8 +40,9 @@ chown -R apache:root /var/www/localhost/htdocs/openemr/sites/
3940
echo "Completed: Fix permissions"
4041

4142
# Perform database upgrade on each directory in sites/
42-
for dirdata in $(find /var/www/localhost/htdocs/openemr/sites/* -maxdepth 0 -type d ); do
43-
sitename=$(basename "${dirdata}")
43+
for dirdata in /var/www/localhost/htdocs/openemr/sites/*/; do
44+
dirdata="${dirdata%/}"
45+
sitename=${dirdata##*/}
4446

4547
# Upgrade database
4648
echo "Start: Upgrade database for ${sitename} from ${priorOpenemrVersion}"

0 commit comments

Comments
 (0)