Skip to content

setup.sh: make submodule checks independent of working directory #4488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GITTYCAT12 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

setup.sh: make submodule checks independent of working directory #4488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aac0257
setup.sh: make submodule checks independent of working directory
GITTYCAT12 Aug 31, 2026
6636f66
setup.sh: handle unset SUDO_USER safely
GITTYCAT12 Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ tmpfile=$(mktemp)
# any error messages from this command will stand out
# more clearly when run as a separate command rather than
# being piped
git submodule status --recursive > "$tmpfile"
git -C "$DIR" submodule status --recursive > "$tmpfile"

if grep -q "^-" "$tmpfile"; then
if [[ "$OSTYPE" == "darwin"* ]]; then
git submodule update --init --recursive
git -C "$DIR" submodule update --init --recursive
else
sudo -u $SUDO_USER git submodule update --init --recursive
sudo -u "${SUDO_USER:-root}" git -C "$DIR" submodule update --init --recursive
fi
elif grep -q "^+" "$tmpfile"; then
# Make it easy for users who are not hacking ORFS to do the right thing,
Expand All @@ -51,5 +51,5 @@ fi
if [[ "$OSTYPE" == "darwin"* ]]; then
"$DIR/etc/DependencyInstaller.sh" -common -prefix="$DIR/dependencies"
else
sudo -u $SUDO_USER "$DIR/etc/DependencyInstaller.sh" -common -prefix="$DIR/dependencies"
sudo -u "${SUDO_USER:-root}" "$DIR/etc/DependencyInstaller.sh" -common -prefix="$DIR/dependencies"
fi