Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] setup/archive: fix extraction of non-tar gz/bz2/xz/zst archives
@ 2024-01-18 21:45 oreo639
  2024-01-18 22:08 ` [PR PATCH] [Merged]: " oreo639
  0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2024-01-18 21:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages fix-archive
https://github.com/void-linux/void-packages/pull/48270

setup/archive: fix extraction of non-tar gz/bz2/xz/zst archives
Extract archive in the destination directory instead of the source directory.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-archive-48270.patch --]
[-- Type: text/x-diff, Size: 1000 bytes --]

From b8edfe56a50bc333ca10703b52c20c59cdae122d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 18 Jan 2024 13:35:38 -0800
Subject: [PATCH] setup/archive: fix extraction of non-tar gz/bz2/xz/zst
 archives

Extract archive in the destination directory instead of the source
directory.
---
 common/environment/setup/archive.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/environment/setup/archive.sh b/common/environment/setup/archive.sh
index 813c0cf863a38..f990e34b8ed70 100644
--- a/common/environment/setup/archive.sh
+++ b/common/environment/setup/archive.sh
@@ -76,16 +76,16 @@ vextract() {
 			if [ "$dst" ]; then cd "$dst"; fi
 			case ${sfx} in
 			gz)
-				gunzip -f $archive
+				gunzip -f ${archive##*/}
 				;;
 			bz2)
-				bunzip2 -f $archive
+				bunzip2 -f ${archive##*/}
 				;;
 			xz)
-				unxz -f $archive
+				unxz -f ${archive##*/}
 				;;
 			zst)
-				unzstd $archive
+				unzstd ${archive##*/}
 				;;
 			esac
 		)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: setup/archive: fix extraction of non-tar gz/bz2/xz/zst archives
  2024-01-18 21:45 [PR PATCH] setup/archive: fix extraction of non-tar gz/bz2/xz/zst archives oreo639
@ 2024-01-18 22:08 ` oreo639
  0 siblings, 0 replies; 2+ messages in thread
From: oreo639 @ 2024-01-18 22:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]

There's a merged pull request on the void-packages repository

setup/archive: fix extraction of non-tar gz/bz2/xz/zst archives
https://github.com/void-linux/void-packages/pull/48270

Description:
Extract archive in the destination directory instead of the source directory.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-01-18 22:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-18 21:45 [PR PATCH] setup/archive: fix extraction of non-tar gz/bz2/xz/zst archives oreo639
2024-01-18 22:08 ` [PR PATCH] [Merged]: " oreo639

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).