Skip to content
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

Fix bug in flatpak crate update script #9856

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Fix bug in flatpak crate update script #9856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion linux/flatpak/flatpak-update-crates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@ EOF
# Grab the latest flatpak builder tools
curl -sSL https://github.com/flatpak/flatpak-builder-tools/raw/master/cargo/flatpak-cargo-generator.py -o $TMPDIR/flatpak-cargo-generator.py

if [ $# -ge 2 ]; then
if [ $# -ge 1 ]; then
# The caller can provide a Cargo.lock file as an argument
echo "Generating dependencies from $1" >&2
CARGO_LOCK_FILE=$1
else
# Otherwise - we need to download the Cargo.lock from the source
CARGO_LOCK_URL=$(parse_cargo_url ${SRCDIR}/org.mozilla.vpn.yml)
CARGO_LOCK_FILE=$TMPDIR/Cargo.lock
echo "Generating dependencies from $CARGO_LOCK_URL" >&2
curl -sSL $CARGO_LOCK_URL -o $CARGO_LOCK_FILE
fi

Expand Down
Loading
Loading