diff --git a/backend/src/s9pk/mod.rs b/backend/src/s9pk/mod.rs index 694ebafd3..e98e0d840 100644 --- a/backend/src/s9pk/mod.rs +++ b/backend/src/s9pk/mod.rs @@ -107,19 +107,7 @@ pub fn pack(#[context] ctx: SdkContext, #[arg] path: Option) -> Result< }) .scripts({ let mut scripts = tar::Builder::new(Vec::new()); - - for (script_volume, _) in manifest - .volumes - .iter() - .filter(|(_, v)| matches!(v, &&Volume::Scripts {})) - { - scripts.append_dir_all( - script_volume, - path.join(manifest.assets.scripts_path()) - .join(script_volume), - )?; - } - + scripts.append_dir_all(script_volume, path.join(manifest.assets.scripts_path()))?; std::io::Cursor::new(scripts.into_inner()?) }) .build() diff --git a/backend/src/volume.rs b/backend/src/volume.rs index 38a234bdc..f7fec55d1 100644 --- a/backend/src/volume.rs +++ b/backend/src/volume.rs @@ -187,8 +187,6 @@ pub enum Volume { #[serde(rename_all = "kebab-case")] Assets {}, #[serde(rename_all = "kebab-case")] - Scripts {}, - #[serde(rename_all = "kebab-case")] Pointer { package_id: PackageId, volume_id: VolumeId, @@ -239,7 +237,6 @@ impl Volume { match self { Volume::Data { .. } => data_dir(&ctx.datadir, pkg_id, volume_id), Volume::Assets {} => asset_dir(&ctx.datadir, pkg_id, version).join(volume_id), - Volume::Scripts {} => script_dir(&ctx.datadir, pkg_id, version).join(volume_id), Volume::Pointer { package_id, volume_id, @@ -272,7 +269,6 @@ impl Volume { match self { Volume::Data { readonly } => *readonly, Volume::Assets {} => true, - Volume::Scripts {} => true, Volume::Pointer { readonly, .. } => *readonly, Volume::Certificate { .. } => true, Volume::Backup { readonly } => *readonly,