From 366142efd4e4fc7b0f76c4394cbe57d66cd4203f Mon Sep 17 00:00:00 2001 From: Alex Lohr 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 " +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 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 " 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 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 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