summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO21
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD58
-rw-r--r--sfsql.patch12
4 files changed, 42 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0e3081fcb13..a9688f8d0e20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
-# Generated by mksrcinfo v8
-# Tue Mar 22 09:39:38 UTC 2016
pkgbase = snowflake-client
- pkgdesc = Snowflake Database command line and JDBC client
- pkgver = 2.7.47
+ pkgdesc = Snowflake Database command line client (snowsql)
+ pkgver = 1.2.24
pkgrel = 1
+ epoch = 1
url = http://www.snowflake.net/
- arch = i686
arch = x86_64
- license = custom: commercial
+ license = custom:commercial
depends = gcc-libs
- depends = java-environment
- depends = bash
- depends = libtinfo
- source = sfsql.patch
- md5sums = 4ddf438900d60621b586979c96078426
+ depends = libxcrypt-compat
+ source = snowflake-client-1.2.24.bash::https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowsql-1.2.24-linux_x86_64.bash
+ source = snowflake-client-1.2.24.bash.sig::https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowsql-1.2.24-linux_x86_64.bash.sig
+ sha256sums = e5c44e71a4fed99aedf23c9beaea0b21826bbc7fdc9f80090339d92588f3f806
+ sha256sums = SKIP
pkgname = snowflake-client
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1626fa044819
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+snowflake-client*.bash
+snowflake-client*.bash.sig
+snowflake-client*.pkg.tar.zst
+snowflake-client*.sh
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 554dec72b50a..3f5e2fce3609 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,36 @@
# Maintainer: D. Can Celasun <can[at]dcc[dot]im>
+# Co-Maintainer: Ethan Pailes ethan[at]pailes[dot]org
+
+# To be able to verify the gpg signatures run:
+# ```
+# gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 630D9F3CAB551AF3
+# printf "trusted-key 630D9F3CAB551AF3\n" >> ~/.gnupg/gpg.conf
+# ```
pkgname=snowflake-client
-pkgver=2.7.47
+pkgver=1.2.24
pkgrel=1
-pkgdesc="Snowflake Database command line and JDBC client"
-arch=('i686' 'x86_64')
+epoch=1
+pkgdesc="Snowflake Database command line client (snowsql)"
+arch=('x86_64')
url="http://www.snowflake.net/"
-license=('custom: commercial')
-depends=(gcc-libs java-environment bash libtinfo)
-source=(sfsql.patch)
-md5sums=('4ddf438900d60621b586979c96078426')
+license=('custom:commercial')
+depends=('gcc-libs'
+ # Needed for libcrypt.so.1
+ 'libxcrypt-compat')
+source=(
+ "${pkgname}-${pkgver}.bash::https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/$(echo ${pkgver} | awk -F. '{print $1 "." $2}')/linux_x86_64/snowsql-${pkgver}-linux_x86_64.bash"
+ "${pkgname}-${pkgver}.bash.sig::https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/$(echo ${pkgver} | awk -F. '{print $1 "." $2}')/linux_x86_64/snowsql-${pkgver}-linux_x86_64.bash.sig"
+)
+sha256sums=('e5c44e71a4fed99aedf23c9beaea0b21826bbc7fdc9f80090339d92588f3f806'
+ 'SKIP')
-_vpkg=snowflake_client.tar.gz
+package() {
+ # Stop Snowflake installer from modifying shell profile
+ local tmp="$(mktemp)"
-build() {
- msg "You need a full, licensed copy of the client in order to install it"
- msg "Searching for ${_vpkg} in dir: \"$startdir\""
- pkgpath="$startdir"
- if [[ ! -f "${pkgpath}/${_vpkg}" ]]; then
- error "Snowflake client package not found, please type absolute path to ${_vpkg} (/home/joe):"
- read pkgpath
- if [[ ! -f "${pkgpath}/${_vpkg}" ]]; then
- error "Unable to find Snowflake client package." && return 1
- fi
- fi
- msg "Found package, unpacking..."
- tar -xf "${pkgpath}/${_vpkg}" -C "${srcdir}"
-
- cd "${srcdir}"
- patch -Np1 -i "${srcdir}/sfsql.patch"
-}
+ SNOWSQL_DEST="${pkgdir}" SNOWSQL_LOGIN_SHELL="${tmp}" sh "${pkgname}-${pkgver}.bash"
-package() {
- install -d "${pkgdir}/opt/${pkgname}"
- install -d "${pkgdir}/usr/bin"
-
- cp -r "${srcdir}/client/"* "${pkgdir}/opt/${pkgname}" -R
- ln -s /opt/${pkgname}/sfsql "${pkgdir}"/usr/bin/sfsql
+ install -Dm755 "${pkgdir}/snowsql" "${pkgdir}/usr/bin/snowsql"
+ rm -f "${pkgdir}/snowsql"
}
diff --git a/sfsql.patch b/sfsql.patch
deleted file mode 100644
index 92554605e308..000000000000
--- a/sfsql.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/client/sfsql b/client/sfsql
---- a/client/sfsql 2015-09-18 22:25:07.000000000 +0300
-+++ b/client/sfsql 2015-09-18 22:31:18.395451951 +0300
-@@ -4,7 +4,7 @@
- # options are ignored if SF_SQL_CONNECT_URL if set
-
- #default values for command line options
--CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-+CLIENT_DIR="/opt/snowflake-client"
- HENPLUS_DIR="$( cd "${CLIENT_DIR}/henplus" && pwd )"
-
- Usage()