Skip to content

Commit

Permalink
Fix gitbranch now that bookworm is dev
Browse files Browse the repository at this point in the history
  • Loading branch information
alexAubin committed Nov 5, 2024
1 parent cf0d1b3 commit 5472c91
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def run(self) -> None:
def run_script(self, name: str) -> None:
self.put_file(SCRIPT_DIR / "recipes", "/root/recipes")

gitbranch = "dev" if self.debian_version == "bullseye" else self.debian_version
gitbranch = "dev" if self.debian_version == "bookworm" else self.debian_version
command = [
"env",
f"RELEASE={self.distribution}",
Expand Down
6 changes: 3 additions & 3 deletions recipes
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ function before_install()
rm install.sh

# Extract the dependencies from control files
curl -L "https://raw.githubusercontent.com/YunoHost/yunohost/$gitbranch/debian/control" -o yunohost_control
curl -L "https://raw.githubusercontent.com/YunoHost/moulinette/$gitbranch/debian/control" -o moulinette_control
curl -L "https://raw.githubusercontent.com/YunoHost/ssowat/$gitbranch/debian/control" -o ssowat_control
curl -s -L "https://raw.githubusercontent.com/YunoHost/yunohost/$gitbranch/debian/control" -o yunohost_control
curl -s -L "https://raw.githubusercontent.com/YunoHost/moulinette/$gitbranch/debian/control" -o moulinette_control
curl -s -L "https://raw.githubusercontent.com/YunoHost/ssowat/$gitbranch/debian/control" -o ssowat_control

# To extract the dependencies, we want to retrieve the lines between "^Dependencies:" and the new line that doesn't
# start with a space (exclusively) . Then, we remove ",", then we remove the version specifiers "(>= X.Y)",
Expand Down

0 comments on commit 5472c91

Please sign in to comment.