pantry.tgz url should base on $PKGX_DIST_URL

Author: mxcl

Cargo.lock

@@ -3,7 +3,7 @@ name = "pkgx"
 description = "Run anything"
 authors = ["Max Howell <[email protected]>", "Jacob Heider <[email protected]>"]
 license = "Apache-2.0"
-version = "2.3.1"
+version = "2.3.2"
 edition = "2021"
 repository = "https://github.com/pkgxdev/pkgx"
 

crates/cli/Cargo.toml

@@ -3,7 +3,7 @@ name = "libpkgx"
 description = "Install and run `pkgx` packages"
 authors = ["Max Howell <[email protected]>", "Jacob Heider <[email protected]>"]
 license = "Apache-2.0"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 repository = "https://github.com/pkgxdev/pkgx"
 

crates/lib/Cargo.toml

@@ -1,8 +1,9 @@
 fn main() {
     let dist_url = option_env!("PKGX_DIST_URL").unwrap_or("https://dist.tea.xyz");
-    let default_pantry_url = format!("{dist_url}/pantry.tgz");
-    let pantry_url = option_env!("PKGX_PANTRY_TARBALL_URL").unwrap_or(&default_pantry_url);
+    let default_pantry_tarball_filename = "pantry.tgz";
+    let pantry_url =
+        option_env!("PKGX_PANTRY_TARBALL_FILENAME").unwrap_or(default_pantry_tarball_filename);
 
     println!("cargo:rustc-env=PKGX_DIST_URL={dist_url}");
-    println!("cargo:rustc-env=PKGX_PANTRY_TARBALL_URL={pantry_url}");
+    println!("cargo:rustc-env=PKGX_PANTRY_TARBALL_FILENAME={pantry_url}");
 }

crates/lib/build.rs

@@ -47,7 +47,11 @@ pub async fn update(config: &Config, conn: &mut Connection) -> Result<(), Box<dy
 }
 
 async fn replace(config: &Config, conn: &mut Connection) -> Result<(), Box<dyn Error>> {
-    let url = env!("PKGX_PANTRY_TARBALL_URL");
+    let url = format!(
+        "{}/{}",
+        config.dist_url,
+        env!("PKGX_PANTRY_TARBALL_FILENAME")
+    );
     let dest = &config.pantry_dir;
 
     std::fs::create_dir_all(dest)?;
@@ -56,7 +60,7 @@ async fn replace(config: &Config, conn: &mut Connection) -> Result<(), Box<dyn E
         .open(dest)?;
     dir.lock_exclusive()?;
 
-    download_and_extract_pantry(url, dest).await?;
+    download_and_extract_pantry(&url, dest).await?;
 
     pantry_db::cache(config, conn)?;