Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

closes #661 and #737

Browse Source
This commit is contained in:
Aiden McClelland
2021-11-08 16:35:13 -07:00
committed by Aiden McClelland
parent 6eb2dfbb5e
commit d55586755d
4 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
appmgr/src/install/mod.rs
View File

@@ -37,6 +37,7 @@ use crate::s9pk::reader::S9pkReader;
use crate::status::{MainStatus, Status};
use crate::util::io::copy_and_shutdown;
use crate::util::{display_none, display_serializable, AsyncFileExt, Version};
use crate::version::{Current, VersionT};
use crate::volume::asset_dir;
use crate::{Error, ResultExt};
@@ -83,12 +84,20 @@ pub async fn install(
let reg_url = ctx.package_registry_url().await?;
let (man_res, s9pk) = tokio::try_join!(
reqwest::get(format!(
"{}/package/manifest/{}?version={}",
reg_url, pkg_id, version
"{}/package/manifest/{}?version={}&eos-version={}&arch={}",
reg_url,
pkg_id,
version,
Current::new().semver(),
platforms::TARGET_ARCH,
)),
reqwest::get(format!(
"{}/package/{}.s9pk?version={}",
reg_url, pkg_id, version
"{}/package/{}.s9pk?version={}&eos-version={}&arch={}",
reg_url,
pkg_id,
version,
Current::new().semver(),
platforms::TARGET_ARCH,
))
)
.with_kind(crate::ErrorKind::Registry)?;
@@ -386,8 +395,12 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
let reg_url = ctx.package_registry_url().await?;
for (dep, info) in &manifest.dependencies.0 {
let manifest: Option<Manifest> = match reqwest::get(format!(
"{}/package/manifest/{}?version={}",
reg_url, dep, info.version
"{}/package/manifest/{}?version={}&eos-version={}&arch={}",
reg_url,
dep,
info.version,
Current::new().semver(),
platforms::TARGET_ARCH,
))
.await
.with_kind(crate::ErrorKind::Registry)?
@@ -412,8 +425,12 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
if tokio::fs::metadata(&icon_path).await.is_err() {
tokio::fs::create_dir_all(&dir).await?;
let icon = reqwest::get(format!(
"{}/package/icon/{}?version={}",
reg_url, dep, info.version
"{}/package/icon/{}?version={}&eos-version={}&arch={}",
reg_url,
dep,
info.version,
Current::new().semver(),
platforms::TARGET_ARCH,
))
.await
.with_kind(crate::ErrorKind::Registry)?;