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.

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

edgedb: 4.1.1 -> 5.1.0 #309768

Merged
merged 2 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/portable/install.rs b/src/portable/install.rs
index dc0d932..5394fc1 100644
index 15944e4..f873349 100644
--- a/src/portable/install.rs
+++ b/src/portable/install.rs
@@ -133,8 +133,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path)
@@ -134,8 +134,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
for entry in arch.entries()? {
let mut entry = entry?;
let path = entry.path()?;
Expand All @@ -11,7 +11,7 @@ index dc0d932..5394fc1 100644
+ path_iter.next(); // discards first folder
+ path_iter.as_path().starts_with("bin")
+ };
if let Some(path) = build_path(&target_dir, &*path)? {
if let Some(path) = build_path(&target_dir, &path)? {
- entry.unpack(path)?;
+ entry.unpack(&path)?;
+ if is_inside_bin {
Expand All @@ -20,7 +20,7 @@ index dc0d932..5394fc1 100644
}
}
bar.finish_and_clear();
@@ -203,3 +211,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {
@@ -222,3 +230,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {

Ok(info)
}
Expand Down
Loading