* [PR PATCH] New package: volta-0.7.0
@ 2020-01-21 14:49 voidlinux-github
2020-01-28 9:07 ` [PR PATCH] [Updated] " voidlinux-github
` (14 more replies)
0 siblings, 15 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-21 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
There is a new pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.0
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 2282 bytes --]
From 366142efd4e4fc7b0f76c4394cbe57d66cd4203f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH] New package: volta-0.7.0
---
.../patches/openssl-sys-fix-version.patch | 11 +++++++
srcpkgs/volta/template | 31 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/volta/patches/openssl-sys-fix-version.patch
create mode 100644 srcpkgs/volta/template
diff --git a/srcpkgs/volta/patches/openssl-sys-fix-version.patch b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
new file mode 100644
index 00000000000..7f89a2a632f
--- /dev/null
+++ b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
@@ -0,0 +1,11 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -39,6 +39,7 @@ structopt = "0.2.14"
+ rand = "0.5"
+ cfg-if = "0.1"
+ mockito = { version = "0.14.0", optional = true }
++openssl-sys = { version = "0.9.53" }
+ test-support = { path = "crates/test-support" }
+ textwrap = "0.11.0"
+ which = "2.0.1"
+
\ No newline at end of file
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..7a9280dd96a
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,31 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.0
+revision=1
+build_helper="rust"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+depends=""
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+
+ echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
+}
\ No newline at end of file
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.0
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
@ 2020-01-28 9:07 ` voidlinux-github
2020-01-28 10:09 ` [PR PATCH] [Updated] New package: volta-0.7.1 voidlinux-github
` (13 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-28 9:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.0
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 5470 bytes --]
From 366142efd4e4fc7b0f76c4394cbe57d66cd4203f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH 1/2] New package: volta-0.7.0
---
.../patches/openssl-sys-fix-version.patch | 11 +++++++
srcpkgs/volta/template | 31 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/volta/patches/openssl-sys-fix-version.patch
create mode 100644 srcpkgs/volta/template
diff --git a/srcpkgs/volta/patches/openssl-sys-fix-version.patch b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
new file mode 100644
index 00000000000..7f89a2a632f
--- /dev/null
+++ b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
@@ -0,0 +1,11 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -39,6 +39,7 @@ structopt = "0.2.14"
+ rand = "0.5"
+ cfg-if = "0.1"
+ mockito = { version = "0.14.0", optional = true }
++openssl-sys = { version = "0.9.53" }
+ test-support = { path = "crates/test-support" }
+ textwrap = "0.11.0"
+ which = "2.0.1"
+
\ No newline at end of file
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..7a9280dd96a
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,31 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.0
+revision=1
+build_helper="rust"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+depends=""
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+
+ echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
+}
\ No newline at end of file
From 46bb68261467f315aa8e0ad307c50760589d29e6 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jan 2020 10:06:25 +0100
Subject: [PATCH 2/2] volta: update to 0.7.1
---
srcpkgs/volta/template | 78 +++++++++++++++++++++++++++++++++---------
1 file changed, 61 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7a9280dd96a..8be45be3e35 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,31 +1,75 @@
# Template file for 'volta'
pkgname=volta
-version=0.7.0
+version=0.7.1
revision=1
+archs="x86_64 i686"
build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
short_desc="JavaScript tool version sync helper"
maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="BSD-2-Clause"
homepage="https://volta.sh/"
-hostmakedepends="cargo pkg-config"
-makedepends="libressl-devel"
-depends=""
distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
-checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
do_build() {
- cargo build --release --target ${RUST_TARGET}
+ cargo build --release --target ${RUST_TARGET}
+
+ cat >> shell/unix/install.sh <<_EOF
+createDir() {
+ if [ ! -d "$1"]; then
+ mkdir "$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "$2" ]; then
+ ln -s "$1" "$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "$1" ]; then
+ if [ -z $(grep "$2" "$1") ]; then
+ echo "" >> "$1"
+ echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
+ echo "export PATH=\"$HOME/.volta/bin:$PATH\"" >> "$1"
+ echo "source $2" >> "$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "$HOME/.volta"
+createDir "$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
+
+_EOF
}
do_install() {
- vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
- vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
- vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
-
- vmkdir etc/volta 755
- vinstall shell/unix/load.bash 755 etc/volta
- vinstall shell/unix/load.sh 755 etc/volta
- vinstall shell/unix/load.fish 755 etc/volta
-
- echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
-}
\ No newline at end of file
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall shell/unix/install.sh 755 etc/volta
+
+ echo "To install volta, use etc/volta/install.sh"
+}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
2020-01-28 9:07 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-28 10:09 ` voidlinux-github
2020-01-28 10:41 ` voidlinux-github
` (12 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-28 10:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.1
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 8582 bytes --]
From 366142efd4e4fc7b0f76c4394cbe57d66cd4203f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH 1/3] New package: volta-0.7.0
---
.../patches/openssl-sys-fix-version.patch | 11 +++++++
srcpkgs/volta/template | 31 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/volta/patches/openssl-sys-fix-version.patch
create mode 100644 srcpkgs/volta/template
diff --git a/srcpkgs/volta/patches/openssl-sys-fix-version.patch b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
new file mode 100644
index 00000000000..7f89a2a632f
--- /dev/null
+++ b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
@@ -0,0 +1,11 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -39,6 +39,7 @@ structopt = "0.2.14"
+ rand = "0.5"
+ cfg-if = "0.1"
+ mockito = { version = "0.14.0", optional = true }
++openssl-sys = { version = "0.9.53" }
+ test-support = { path = "crates/test-support" }
+ textwrap = "0.11.0"
+ which = "2.0.1"
+
\ No newline at end of file
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..7a9280dd96a
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,31 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.0
+revision=1
+build_helper="rust"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+depends=""
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+
+ echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
+}
\ No newline at end of file
From 46bb68261467f315aa8e0ad307c50760589d29e6 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jan 2020 10:06:25 +0100
Subject: [PATCH 2/3] volta: update to 0.7.1
---
srcpkgs/volta/template | 78 +++++++++++++++++++++++++++++++++---------
1 file changed, 61 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7a9280dd96a..8be45be3e35 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,31 +1,75 @@
# Template file for 'volta'
pkgname=volta
-version=0.7.0
+version=0.7.1
revision=1
+archs="x86_64 i686"
build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
short_desc="JavaScript tool version sync helper"
maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="BSD-2-Clause"
homepage="https://volta.sh/"
-hostmakedepends="cargo pkg-config"
-makedepends="libressl-devel"
-depends=""
distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
-checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
do_build() {
- cargo build --release --target ${RUST_TARGET}
+ cargo build --release --target ${RUST_TARGET}
+
+ cat >> shell/unix/install.sh <<_EOF
+createDir() {
+ if [ ! -d "$1"]; then
+ mkdir "$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "$2" ]; then
+ ln -s "$1" "$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "$1" ]; then
+ if [ -z $(grep "$2" "$1") ]; then
+ echo "" >> "$1"
+ echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
+ echo "export PATH=\"$HOME/.volta/bin:$PATH\"" >> "$1"
+ echo "source $2" >> "$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "$HOME/.volta"
+createDir "$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
+
+_EOF
}
do_install() {
- vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
- vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
- vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
-
- vmkdir etc/volta 755
- vinstall shell/unix/load.bash 755 etc/volta
- vinstall shell/unix/load.sh 755 etc/volta
- vinstall shell/unix/load.fish 755 etc/volta
-
- echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
-}
\ No newline at end of file
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall shell/unix/install.sh 755 etc/volta
+
+ echo "To install volta, use etc/volta/install.sh"
+}
From 867322a7ef24a2514503bfe45d57caedd7ce9ab1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jan 2020 11:10:26 +0100
Subject: [PATCH 3/3] volta: fix install script
---
srcpkgs/volta/template | 52 ++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 8be45be3e35..fde063c3200 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,7 +1,7 @@
# Template file for 'volta'
pkgname=volta
version=0.7.1
-revision=1
+revision=2
archs="x86_64 i686"
build_helper="rust"
hostmakedepends="cargo pkg-config"
@@ -13,51 +13,53 @@ homepage="https://volta.sh/"
distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
-do_build() {
- cargo build --release --target ${RUST_TARGET}
-
+post_patch() {
cat >> shell/unix/install.sh <<_EOF
createDir() {
- if [ ! -d "$1"]; then
- mkdir "$1"
+ if [ ! -d "\$1" ]; then
+ mkdir "\$1"
fi
}
createSymlink() {
- if [ ! -e "$2" ]; then
- ln -s "$1" "$2"
+ if [ ! -e "\$2" ]; then
+ ln -s "\$1" "\$2"
fi
}
installProfile() {
- if [ -e "$1" ]; then
- if [ -z $(grep "$2" "$1") ]; then
- echo "" >> "$1"
- echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
- echo "export PATH=\"$HOME/.volta/bin:$PATH\"" >> "$1"
- echo "source $2" >> "$1"
+ if [ -e "\$1" ]; then
+ isInstalled=\$(grep "\$2" "\$1")
+ if [ -z "\$isInstalled" ]; then
+ echo "" >> "\$1"
+ echo "export VOLTA_HOME=\"\$HOME/.volta\"" >> "\$1"
+ echo "export PATH=\"\$HOME/.volta/bin:\\\$PATH\"" >> "\$1"
+ echo "source \$2" >> "\$1"
fi
fi
}
# Create directories
-createDir "$HOME/.volta"
-createDir "$HOME/.volta/bin"
+createDir "\$HOME/.volta"
+createDir "\$HOME/.volta/bin"
# Create symlinks
-createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
-createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
-createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+createSymlink "/usr/bin/volta" "\$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "\$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "\$HOME/.volta/volta-shim"
# Install profile
-installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
-installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
-installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
-installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
-
+installProfile "\$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "\$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "\$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "\$HOME/.zshrc" "/etc/volta/load.sh"
_EOF
}
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
do_install() {
vlicense LICENSE
@@ -71,5 +73,5 @@ do_install() {
vinstall shell/unix/load.fish 755 etc/volta
vinstall shell/unix/install.sh 755 etc/volta
- echo "To install volta, use etc/volta/install.sh"
+ echo "To install volta locally, use etc/volta/install.sh"
}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
2020-01-28 9:07 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-28 10:09 ` [PR PATCH] [Updated] New package: volta-0.7.1 voidlinux-github
@ 2020-01-28 10:41 ` voidlinux-github
2020-01-28 19:03 ` [PR PATCH] [Updated] " voidlinux-github
` (11 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-28 10:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-579184352
Comment:
I updated the version and added an install script to automate the local installation for any user. If you have any ideas for additional improvements, please tell me so I can add them.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (2 preceding siblings ...)
2020-01-28 10:41 ` voidlinux-github
@ 2020-01-28 19:03 ` voidlinux-github
2020-01-30 8:56 ` voidlinux-github
` (10 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-28 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.1
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 9164 bytes --]
From 366142efd4e4fc7b0f76c4394cbe57d66cd4203f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH 1/4] New package: volta-0.7.0
---
.../patches/openssl-sys-fix-version.patch | 11 +++++++
srcpkgs/volta/template | 31 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/volta/patches/openssl-sys-fix-version.patch
create mode 100644 srcpkgs/volta/template
diff --git a/srcpkgs/volta/patches/openssl-sys-fix-version.patch b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
new file mode 100644
index 00000000000..7f89a2a632f
--- /dev/null
+++ b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
@@ -0,0 +1,11 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -39,6 +39,7 @@ structopt = "0.2.14"
+ rand = "0.5"
+ cfg-if = "0.1"
+ mockito = { version = "0.14.0", optional = true }
++openssl-sys = { version = "0.9.53" }
+ test-support = { path = "crates/test-support" }
+ textwrap = "0.11.0"
+ which = "2.0.1"
+
\ No newline at end of file
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..7a9280dd96a
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,31 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.0
+revision=1
+build_helper="rust"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+depends=""
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
+ vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+
+ echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
+}
\ No newline at end of file
From 46bb68261467f315aa8e0ad307c50760589d29e6 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jan 2020 10:06:25 +0100
Subject: [PATCH 2/4] volta: update to 0.7.1
---
srcpkgs/volta/template | 78 +++++++++++++++++++++++++++++++++---------
1 file changed, 61 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7a9280dd96a..8be45be3e35 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,31 +1,75 @@
# Template file for 'volta'
pkgname=volta
-version=0.7.0
+version=0.7.1
revision=1
+archs="x86_64 i686"
build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
short_desc="JavaScript tool version sync helper"
maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="BSD-2-Clause"
homepage="https://volta.sh/"
-hostmakedepends="cargo pkg-config"
-makedepends="libressl-devel"
-depends=""
distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
-checksum=74b97e0488d53b570be745e5380c829ddb59fbc04d0f9ec2e40af612746a05d6
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
do_build() {
- cargo build --release --target ${RUST_TARGET}
+ cargo build --release --target ${RUST_TARGET}
+
+ cat >> shell/unix/install.sh <<_EOF
+createDir() {
+ if [ ! -d "$1"]; then
+ mkdir "$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "$2" ]; then
+ ln -s "$1" "$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "$1" ]; then
+ if [ -z $(grep "$2" "$1") ]; then
+ echo "" >> "$1"
+ echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
+ echo "export PATH=\"$HOME/.volta/bin:$PATH\"" >> "$1"
+ echo "source $2" >> "$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "$HOME/.volta"
+createDir "$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
+
+_EOF
}
do_install() {
- vinstall target/${RUST_TARGET}/release/volta 755 usr/bin
- vinstall target/${RUST_TARGET}/release/volta-shim 755 usr/bin
- vinstall target/${RUST_TARGET}/release/volta-migrate 755 usr/bin
-
- vmkdir etc/volta 755
- vinstall shell/unix/load.bash 755 etc/volta
- vinstall shell/unix/load.sh 755 etc/volta
- vinstall shell/unix/load.fish 755 etc/volta
-
- echo "To use volta automatically, you need to source the correct shell script in /etc/volta"
-}
\ No newline at end of file
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall shell/unix/install.sh 755 etc/volta
+
+ echo "To install volta, use etc/volta/install.sh"
+}
From 867322a7ef24a2514503bfe45d57caedd7ce9ab1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jan 2020 11:10:26 +0100
Subject: [PATCH 3/4] volta: fix install script
---
srcpkgs/volta/template | 52 ++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 8be45be3e35..fde063c3200 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,7 +1,7 @@
# Template file for 'volta'
pkgname=volta
version=0.7.1
-revision=1
+revision=2
archs="x86_64 i686"
build_helper="rust"
hostmakedepends="cargo pkg-config"
@@ -13,51 +13,53 @@ homepage="https://volta.sh/"
distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
-do_build() {
- cargo build --release --target ${RUST_TARGET}
-
+post_patch() {
cat >> shell/unix/install.sh <<_EOF
createDir() {
- if [ ! -d "$1"]; then
- mkdir "$1"
+ if [ ! -d "\$1" ]; then
+ mkdir "\$1"
fi
}
createSymlink() {
- if [ ! -e "$2" ]; then
- ln -s "$1" "$2"
+ if [ ! -e "\$2" ]; then
+ ln -s "\$1" "\$2"
fi
}
installProfile() {
- if [ -e "$1" ]; then
- if [ -z $(grep "$2" "$1") ]; then
- echo "" >> "$1"
- echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
- echo "export PATH=\"$HOME/.volta/bin:$PATH\"" >> "$1"
- echo "source $2" >> "$1"
+ if [ -e "\$1" ]; then
+ isInstalled=\$(grep "\$2" "\$1")
+ if [ -z "\$isInstalled" ]; then
+ echo "" >> "\$1"
+ echo "export VOLTA_HOME=\"\$HOME/.volta\"" >> "\$1"
+ echo "export PATH=\"\$HOME/.volta/bin:\\\$PATH\"" >> "\$1"
+ echo "source \$2" >> "\$1"
fi
fi
}
# Create directories
-createDir "$HOME/.volta"
-createDir "$HOME/.volta/bin"
+createDir "\$HOME/.volta"
+createDir "\$HOME/.volta/bin"
# Create symlinks
-createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
-createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
-createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+createSymlink "/usr/bin/volta" "\$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "\$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "\$HOME/.volta/volta-shim"
# Install profile
-installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
-installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
-installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
-installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
-
+installProfile "\$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "\$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "\$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "\$HOME/.zshrc" "/etc/volta/load.sh"
_EOF
}
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
do_install() {
vlicense LICENSE
@@ -71,5 +73,5 @@ do_install() {
vinstall shell/unix/load.fish 755 etc/volta
vinstall shell/unix/install.sh 755 etc/volta
- echo "To install volta, use etc/volta/install.sh"
+ echo "To install volta locally, use etc/volta/install.sh"
}
From a9e06e29deae427ce87ac982bcd3bfbeae089972 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 28 Jan 2020 20:01:27 +0100
Subject: [PATCH 4/4] volta: add update check
---
srcpkgs/volta/update | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/volta/update
diff --git a/srcpkgs/volta/update b/srcpkgs/volta/update
new file mode 100644
index 00000000000..dbbdc42820f
--- /dev/null
+++ b/srcpkgs/volta/update
@@ -0,0 +1,2 @@
+site="https://github.com/volta-cli/volta/releases"
+pattern="\bv(\d+\.\d+\.\d+)\b"
\ No newline at end of file
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (3 preceding siblings ...)
2020-01-28 19:03 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-30 8:56 ` voidlinux-github
2020-01-31 8:38 ` voidlinux-github
` (9 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-30 8:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.1
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 3660 bytes --]
From 908630f38763696a87e8e8fc6cf7c81f1ef56380 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH] New package: volta-0.7.1
---
.../patches/openssl-sys-fix-version.patch | 11 +++
srcpkgs/volta/template | 77 +++++++++++++++++++
srcpkgs/volta/update | 2 +
3 files changed, 90 insertions(+)
create mode 100644 srcpkgs/volta/patches/openssl-sys-fix-version.patch
create mode 100644 srcpkgs/volta/template
create mode 100644 srcpkgs/volta/update
diff --git a/srcpkgs/volta/patches/openssl-sys-fix-version.patch b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
new file mode 100644
index 00000000000..7f89a2a632f
--- /dev/null
+++ b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
@@ -0,0 +1,11 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -39,6 +39,7 @@ structopt = "0.2.14"
+ rand = "0.5"
+ cfg-if = "0.1"
+ mockito = { version = "0.14.0", optional = true }
++openssl-sys = { version = "0.9.53" }
+ test-support = { path = "crates/test-support" }
+ textwrap = "0.11.0"
+ which = "2.0.1"
+
\ No newline at end of file
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..fde063c3200
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,77 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.1
+revision=2
+archs="x86_64 i686"
+build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
+
+post_patch() {
+ cat >> shell/unix/install.sh <<_EOF
+createDir() {
+ if [ ! -d "\$1" ]; then
+ mkdir "\$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "\$2" ]; then
+ ln -s "\$1" "\$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "\$1" ]; then
+ isInstalled=\$(grep "\$2" "\$1")
+ if [ -z "\$isInstalled" ]; then
+ echo "" >> "\$1"
+ echo "export VOLTA_HOME=\"\$HOME/.volta\"" >> "\$1"
+ echo "export PATH=\"\$HOME/.volta/bin:\\\$PATH\"" >> "\$1"
+ echo "source \$2" >> "\$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "\$HOME/.volta"
+createDir "\$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "\$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "\$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "\$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "\$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "\$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "\$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "\$HOME/.zshrc" "/etc/volta/load.sh"
+_EOF
+}
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall shell/unix/install.sh 755 etc/volta
+
+ echo "To install volta locally, use etc/volta/install.sh"
+}
diff --git a/srcpkgs/volta/update b/srcpkgs/volta/update
new file mode 100644
index 00000000000..dbbdc42820f
--- /dev/null
+++ b/srcpkgs/volta/update
@@ -0,0 +1,2 @@
+site="https://github.com/volta-cli/volta/releases"
+pattern="\bv(\d+\.\d+\.\d+)\b"
\ No newline at end of file
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (4 preceding siblings ...)
2020-01-30 8:56 ` voidlinux-github
@ 2020-01-31 8:38 ` voidlinux-github
2020-01-31 8:48 ` voidlinux-github
` (8 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-31 8:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.1
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 3947 bytes --]
From 104c32aed74fa7a003aff8fe97869693832fcd8a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH] New package: volta-0.7.1
---
srcpkgs/volta/files/install.sh | 38 +++++++++++++++++++
.../patches/openssl-sys-fix-version.patch | 12 ++++++
srcpkgs/volta/template | 34 +++++++++++++++++
srcpkgs/volta/update | 2 +
4 files changed, 86 insertions(+)
create mode 100644 srcpkgs/volta/files/install.sh
create mode 100644 srcpkgs/volta/patches/openssl-sys-fix-version.patch
create mode 100644 srcpkgs/volta/template
create mode 100644 srcpkgs/volta/update
diff --git a/srcpkgs/volta/files/install.sh b/srcpkgs/volta/files/install.sh
new file mode 100644
index 00000000000..cac5f16c0cc
--- /dev/null
+++ b/srcpkgs/volta/files/install.sh
@@ -0,0 +1,38 @@
+createDir() {
+ if [ ! -d "$1" ]; then
+ mkdir "$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "$2" ]; then
+ ln -s "$1" "$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "$1" ]; then
+ isInstalled=$(grep "$2" "$1")
+ if [ -z "$isInstalled" ]; then
+ echo "" >> "$1"
+ echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
+ echo "export PATH=\"$HOME/.volta/bin:\$PATH\"" >> "$1"
+ echo "source $2" >> "$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "$HOME/.volta"
+createDir "$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
diff --git a/srcpkgs/volta/patches/openssl-sys-fix-version.patch b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
new file mode 100644
index 00000000000..d39b4d80740
--- /dev/null
+++ b/srcpkgs/volta/patches/openssl-sys-fix-version.patch
@@ -0,0 +1,12 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -39,6 +39,7 @@ structopt = "0.2.14"
+ rand = "0.5"
+ cfg-if = "0.1"
+ mockito = { version = "0.14.0", optional = true }
++openssl-sys = { version = "0.9.53" }
+ test-support = { path = "crates/test-support" }
+ textwrap = "0.11.0"
+ which = "2.0.1"
+
+
\ No newline at end of file
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..320d28eac6d
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,34 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.1
+revision=1
+archs="x86_64 i686"
+build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall ${FILESDIR}/install.sh 755 etc/volta
+
+ echo "To install volta locally, use etc/volta/install.sh"
+}
diff --git a/srcpkgs/volta/update b/srcpkgs/volta/update
new file mode 100644
index 00000000000..7e45e278a6c
--- /dev/null
+++ b/srcpkgs/volta/update
@@ -0,0 +1,2 @@
+site="https://github.com/volta-cli/volta/releases"
+pattern="\bv(\d+\.\d+\.\d+)\b"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (5 preceding siblings ...)
2020-01-31 8:38 ` voidlinux-github
@ 2020-01-31 8:48 ` voidlinux-github
2020-01-31 9:25 ` voidlinux-github
` (7 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-31 8:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.1
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 3232 bytes --]
From bf600d89e3dc8cda8b596ca96ef14959c7e4bc8e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH] New package: volta-0.7.1
---
srcpkgs/volta/files/install.sh | 38 ++++++++++++++++++++++++++++++++++
srcpkgs/volta/template | 36 ++++++++++++++++++++++++++++++++
srcpkgs/volta/update | 2 ++
3 files changed, 76 insertions(+)
create mode 100644 srcpkgs/volta/files/install.sh
create mode 100644 srcpkgs/volta/template
create mode 100644 srcpkgs/volta/update
diff --git a/srcpkgs/volta/files/install.sh b/srcpkgs/volta/files/install.sh
new file mode 100644
index 00000000000..cac5f16c0cc
--- /dev/null
+++ b/srcpkgs/volta/files/install.sh
@@ -0,0 +1,38 @@
+createDir() {
+ if [ ! -d "$1" ]; then
+ mkdir "$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "$2" ]; then
+ ln -s "$1" "$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "$1" ]; then
+ isInstalled=$(grep "$2" "$1")
+ if [ -z "$isInstalled" ]; then
+ echo "" >> "$1"
+ echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
+ echo "export PATH=\"$HOME/.volta/bin:\$PATH\"" >> "$1"
+ echo "source $2" >> "$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "$HOME/.volta"
+createDir "$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..9b8d2269e5c
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,36 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.1
+revision=1
+archs="x86_64 i686"
+build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
+
+pre_build() {
+ cargo add --package openssl-sys --precise 0.9.53
+}
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall ${FILESDIR}/install.sh 755 etc/volta
+}
diff --git a/srcpkgs/volta/update b/srcpkgs/volta/update
new file mode 100644
index 00000000000..7e45e278a6c
--- /dev/null
+++ b/srcpkgs/volta/update
@@ -0,0 +1,2 @@
+site="https://github.com/volta-cli/volta/releases"
+pattern="\bv(\d+\.\d+\.\d+)\b"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (6 preceding siblings ...)
2020-01-31 8:48 ` voidlinux-github
@ 2020-01-31 9:25 ` voidlinux-github
2020-01-31 9:52 ` voidlinux-github
` (6 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-31 9:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
There is an updated pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages feat-volta
https://github.com/void-linux/void-packages/pull/18446
New package: volta-0.7.1
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
A patch file from https://github.com/void-linux/void-packages/pull/18446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feat-volta-18446.patch --]
[-- Type: text/x-diff, Size: 3235 bytes --]
From b10bec03b150bf535beb983118f9a8cfb37772fa Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexloh@T490.fritz.box>
Date: Tue, 21 Jan 2020 15:49:52 +0100
Subject: [PATCH] New package: volta-0.7.1
---
srcpkgs/volta/files/install.sh | 38 ++++++++++++++++++++++++++++++++++
srcpkgs/volta/template | 36 ++++++++++++++++++++++++++++++++
srcpkgs/volta/update | 2 ++
3 files changed, 76 insertions(+)
create mode 100644 srcpkgs/volta/files/install.sh
create mode 100644 srcpkgs/volta/template
create mode 100644 srcpkgs/volta/update
diff --git a/srcpkgs/volta/files/install.sh b/srcpkgs/volta/files/install.sh
new file mode 100644
index 00000000000..cac5f16c0cc
--- /dev/null
+++ b/srcpkgs/volta/files/install.sh
@@ -0,0 +1,38 @@
+createDir() {
+ if [ ! -d "$1" ]; then
+ mkdir "$1"
+ fi
+}
+
+createSymlink() {
+ if [ ! -e "$2" ]; then
+ ln -s "$1" "$2"
+ fi
+}
+
+installProfile() {
+ if [ -e "$1" ]; then
+ isInstalled=$(grep "$2" "$1")
+ if [ -z "$isInstalled" ]; then
+ echo "" >> "$1"
+ echo "export VOLTA_HOME=\"$HOME/.volta\"" >> "$1"
+ echo "export PATH=\"$HOME/.volta/bin:\$PATH\"" >> "$1"
+ echo "source $2" >> "$1"
+ fi
+ fi
+}
+
+# Create directories
+createDir "$HOME/.volta"
+createDir "$HOME/.volta/bin"
+
+# Create symlinks
+createSymlink "/usr/bin/volta" "$HOME/.volta/volta"
+createSymlink "/usr/bin/volta-migrate" "$HOME/.volta/volta-migrate"
+createSymlink "/usr/bin/volta-shim" "$HOME/.volta/volta-shim"
+
+# Install profile
+installProfile "$HOME/.bashrc" "/etc/volta/load.bash"
+installProfile "$HOME/.cshrc" "/etc/volta/load.sh"
+installProfile "$HOME/.config/fish/config.fish" "/etc/volta/load.fish"
+installProfile "$HOME/.zshrc" "/etc/volta/load.sh"
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
new file mode 100644
index 00000000000..c5cfdf431a4
--- /dev/null
+++ b/srcpkgs/volta/template
@@ -0,0 +1,36 @@
+# Template file for 'volta'
+pkgname=volta
+version=0.7.1
+revision=1
+archs="x86_64 i686"
+build_helper="rust"
+hostmakedepends="cargo pkg-config"
+makedepends="libressl-devel"
+short_desc="JavaScript tool version sync helper"
+maintainer="Alex Lohr <alex.lohr@logmein.com>"
+license="BSD-2-Clause"
+homepage="https://volta.sh/"
+distfiles="https://github.com/volta-cli/${pkgname}/archive/v${version}.tar.gz"
+checksum=e53a07e167bb64103f36901423f5a377a2ea89ecfdd7a1343e69d659f99f9c1b
+
+pre_build() {
+ cargo update --package openssl-sys --precise 0.9.53
+}
+
+do_build() {
+ cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+ vlicense LICENSE
+
+ vbin target/${RUST_TARGET}/release/volta
+ vbin target/${RUST_TARGET}/release/volta-shim
+ vbin target/${RUST_TARGET}/release/volta-migrate
+
+ vmkdir etc/volta 755
+ vinstall shell/unix/load.bash 755 etc/volta
+ vinstall shell/unix/load.sh 755 etc/volta
+ vinstall shell/unix/load.fish 755 etc/volta
+ vinstall ${FILESDIR}/install.sh 755 etc/volta
+}
diff --git a/srcpkgs/volta/update b/srcpkgs/volta/update
new file mode 100644
index 00000000000..7e45e278a6c
--- /dev/null
+++ b/srcpkgs/volta/update
@@ -0,0 +1,2 @@
+site="https://github.com/volta-cli/volta/releases"
+pattern="\bv(\d+\.\d+\.\d+)\b"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (7 preceding siblings ...)
2020-01-31 9:25 ` voidlinux-github
@ 2020-01-31 9:52 ` voidlinux-github
2020-02-01 13:05 ` voidlinux-github
` (5 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-01-31 9:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-580664383
Comment:
Searching through the source of volta, I may have found a way to use the globally installed binaries. I have to test it later.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (8 preceding siblings ...)
2020-01-31 9:52 ` voidlinux-github
@ 2020-02-01 13:05 ` voidlinux-github
2020-02-02 2:33 ` voidlinux-github
` (4 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-01 13:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-581028455
Comment:
Unfortunately, the part that would allow global libraries seems to be unfinished. I have opened a feature request with volta. If I find the time, I might open an PR later.
So just for added clarity: if the binaries were system-wide by default, this app would be acceptable?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (9 preceding siblings ...)
2020-02-01 13:05 ` voidlinux-github
@ 2020-02-02 2:33 ` voidlinux-github
2020-02-02 2:33 ` voidlinux-github
` (3 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-02 2:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-581090792
Comment:
If the binaries were system wide by default, I could consider this just another package.
That it tries to be a home-based app and requires that installation script makes this template seem unhelpful. If it didn't require per-user "installation" then I would be much happier.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (10 preceding siblings ...)
2020-02-02 2:33 ` voidlinux-github
@ 2020-02-02 2:33 ` voidlinux-github
2020-02-02 8:09 ` voidlinux-github
` (2 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-02 2:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-581090792
Comment:
If the binaries were system wide by default, I could consider this just another package.
That it tries to be a home-based app and requires that installation script makes this template seem less likable. If it didn't require per-user "installation" then I would be much happier.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (11 preceding siblings ...)
2020-02-02 2:33 ` voidlinux-github
@ 2020-02-02 8:09 ` voidlinux-github
2020-02-02 8:09 ` [PR PATCH] [Closed]: " voidlinux-github
2020-02-03 9:04 ` voidlinux-github
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-02 8:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-581109705
Comment:
Thanks for the feedback. I'll try to make this happen and reopen the PR then.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Closed]: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (12 preceding siblings ...)
2020-02-02 8:09 ` voidlinux-github
@ 2020-02-02 8:09 ` voidlinux-github
2020-02-03 9:04 ` voidlinux-github
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-02 8:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
There's a closed pull request on the void-packages repository
New package: volta-0.7.1
https://github.com/void-linux/void-packages/pull/18446
Description:
Volta is a JavaScript utility version handling tool written in rust; unfortunately, binaries are only available for openssl, so it needs to be compiled for libressl. The original is supposed to be installed to a hidden directory, but since that does not fit into the workflow, I changed the installation to put the binaries into /usr/bin and the scripts into /etc/volta (where you can source them from your .bashrc or .zshrc).
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: New package: volta-0.7.1
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
` (13 preceding siblings ...)
2020-02-02 8:09 ` [PR PATCH] [Closed]: " voidlinux-github
@ 2020-02-03 9:04 ` voidlinux-github
14 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-03 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
New comment by atk on void-packages repository
https://github.com/void-linux/void-packages/pull/18446#issuecomment-581308032
Comment:
I have found that the sole reason this did not work was the shell script that wasn't yet updated to support this. I have added a patch so the system binaries are used now.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Closed]: New package: volta-0.7.1
2020-02-03 10:11 [PR PATCH] " voidlinux-github
@ 2020-02-06 3:33 ` voidlinux-github
0 siblings, 0 replies; 17+ messages in thread
From: voidlinux-github @ 2020-02-06 3:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
There's a closed pull request on the void-packages repository
New package: volta-0.7.1
https://github.com/void-linux/void-packages/pull/18756
Description:
See https://github.com/void-linux/void-packages/pull/18446. Unfortunately, I was not able to reopen the PR due to the force push (my bad). The comments from this PR have been resolved.
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-02-06 3:33 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-21 14:49 [PR PATCH] New package: volta-0.7.0 voidlinux-github
2020-01-28 9:07 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-28 10:09 ` [PR PATCH] [Updated] New package: volta-0.7.1 voidlinux-github
2020-01-28 10:41 ` voidlinux-github
2020-01-28 19:03 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-30 8:56 ` voidlinux-github
2020-01-31 8:38 ` voidlinux-github
2020-01-31 8:48 ` voidlinux-github
2020-01-31 9:25 ` voidlinux-github
2020-01-31 9:52 ` voidlinux-github
2020-02-01 13:05 ` voidlinux-github
2020-02-02 2:33 ` voidlinux-github
2020-02-02 2:33 ` voidlinux-github
2020-02-02 8:09 ` voidlinux-github
2020-02-02 8:09 ` [PR PATCH] [Closed]: " voidlinux-github
2020-02-03 9:04 ` voidlinux-github
2020-02-03 10:11 [PR PATCH] " voidlinux-github
2020-02-06 3:33 ` [PR PATCH] [Closed]: " voidlinux-github
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).