Bump version and refactor

3 files changed, 43 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16f64a149188..3473849d1b5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,26 @@
 pkgbase = rvm
 	pkgdesc = RVM is a command-line tool which allows you to easily install, manage, and work with multiple ruby environments from interpreters to sets of gems.
-	pkgver = 1.29.10
+	pkgver = 1.29.12
 	pkgrel = 1
-	url = https://rvm.io/
+	url = https://github.com/rvm/rvm/
 	arch = any
 	license = Apache License
+	makedepends = curl
 	depends = gdbm
 	depends = openssl
 	depends = libffi
 	depends = libyaml
 	depends = gmp
 	depends = zlib
-	provides = rvm
-	provides = ruby
-	conflicts = ruby
-	source = https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer
-	source = rvm_init.sh
+	source = https://raw.githubusercontent.com/rvm/rvm/1.29.12/binscripts/rvm-installer
+	source = https://raw.githubusercontent.com/rvm/rvm/1.29.12/binscripts/rvm-installer.asc
 	source = rvm.sh
 	source = rvmrc
+	validpgpkeys = 409B6B1796C275462A1703113804BB82D39DC0E3
+	validpgpkeys = 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 	sha256sums = fea24461e98d41528d6e28684aa4c216dbe903869bc3fcdb3493b6518fae2e7e
-	sha256sums = f09f9a144a3d33409c1f394d7ba37f783b8034fbd6405e8536bf9bfec87c6af0
+	sha256sums = 74b9015e977412ee63b9ce7521111f82e71b013bb2ad512855a04e37cd2f526c
 	sha256sums = 48b6e852380c9e9b8d3b3c3ce8e50d397429dd1efeee06a75e121df1a2df47e2
 	sha256sums = f9444e8c5817c4a59fc701b8a71cef0a7114a9dda549ad82c5800983f1a54738
 
 pkgname = rvm
-
diff --git a/PKGBUILD b/PKGBUILD
index c9369176f671..4003dc9fdea7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,50 @@
-# Maintainer: Felix Golatofski <contact@xdfr.de>
-# https://github.com/rvm/rvm/
+# Maintainer: Gennadiy Mykhailiuta <gmykhailiuta@gmail.com>
+# Contributor: Felix Golatofski <contact@xdfr.de>
 
 pkgname=rvm
 pkgbase=${pkgname}
-pkgver=1.29.10
+pkgver=1.29.12
 pkgrel=1
 pkgdesc='RVM is a command-line tool which allows you to easily install, manage, and work with multiple ruby environments from interpreters to sets of gems.'
 arch=('any')
-url="https://rvm.io/"
+url="https://github.com/rvm/rvm/"
 license=('Apache License')
 depends=('gdbm' 'openssl'  'libffi'  'libyaml'  'gmp'  'zlib')
-provides=('rvm' 'ruby')
-conflicts=('ruby')
-source=("https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer"
-        "rvm_init.sh"
-        "rvm.sh"
-        "rvmrc")
-sha256sums=('fea24461e98d41528d6e28684aa4c216dbe903869bc3fcdb3493b6518fae2e7e'
-            'f09f9a144a3d33409c1f394d7ba37f783b8034fbd6405e8536bf9bfec87c6af0'
-            '48b6e852380c9e9b8d3b3c3ce8e50d397429dd1efeee06a75e121df1a2df47e2'
-            'f9444e8c5817c4a59fc701b8a71cef0a7114a9dda549ad82c5800983f1a54738')
+makedepends=('curl')
+source=(
+  "https://raw.githubusercontent.com/rvm/rvm/${pkgver}/binscripts/rvm-installer"
+  "https://raw.githubusercontent.com/rvm/rvm/${pkgver}/binscripts/rvm-installer.asc"
+  "rvm.sh"
+  "rvmrc"
+)
+sha256sums=(
+  'fea24461e98d41528d6e28684aa4c216dbe903869bc3fcdb3493b6518fae2e7e'
+  '74b9015e977412ee63b9ce7521111f82e71b013bb2ad512855a04e37cd2f526c'
+  '48b6e852380c9e9b8d3b3c3ce8e50d397429dd1efeee06a75e121df1a2df47e2'
+  'f9444e8c5817c4a59fc701b8a71cef0a7114a9dda549ad82c5800983f1a54738'
+)
+validpgpkeys=(
+  '409B6B1796C275462A1703113804BB82D39DC0E3'
+  '7D2BAF1CF37B13E2069D6956105BD0E739499BDB'
+)
 
 build() {
-  gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-  chmod +x rvm-installer
-  ./rvm-installer --path $srcdir/rvm --ignore-dotfiles --version ${pkgver}
+  export rvm_ignore_gemrc_issues=1
+  bash ./rvm-installer --path $srcdir/rvm --ignore-dotfiles --version ${pkgver}
 }
 
 package() {
   cd "$srcdir"
-  DESTDIR="$pkgdir/usr/share"
-  DESTETC="$pkgdir/etc"
-  mkdir -p "$DESTDIR"
-	cp -r "rvm" "$DESTDIR/"
-  mkdir -p "$DESTETC/profile.d"
-  cp rvm_init.sh "$DESTETC/profile.d/"
-#  cp rvm.sh "$DESTETC/profile.d/"
-  cp rvmrc "$DESTETC/"
-  mkdir -p "$DESTETC/skel/.rvm"
-  cd "$DESTETC/skel/.rvm"
-  mkdir archives  bin  environments  gems  gems_cache  hooks  log  pkgs  repos  rubies  rubygems  src  tmp  user  wrappers
+
+  # /etc
+  install -dm0755 "$pkgdir"/etc/profile.d
+  install -Dm644 rvm.sh -t "$pkgdir"/etc/profile.d/
+  install -Dm644 rvmrc -t "$pkgdir"/etc/
+  install -dm0755 "$pkgdir"/etc/skel/.rvm/{archives,bin,environments,gems,gems_cache,hooks,log,pkgs,repos,rubies,rubygems,src,tmp,user,wrappers}
+
+  # /usr/share
+  install -dm0755 "$pkgdir"/usr/share
+  cd rvm
+  find . -type d -exec install -d {,"$pkgdir"/usr/share/rvm/}{} \;
+  find . -type f -exec install -D {,"$pkgdir"/usr/share/rvm/}{} \;
 }
diff --git a/rvm_init.sh b/rvm_init.sh
deleted file mode 100644
index 46ece183ccb8..000000000000
--- a/rvm_init.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# RVM init profile
-#
-# copys the rvm skeleton to home if it not exists
-#
-
-if [ ! -d "$HOME/.rvm" ]; then
-  cp -r /etc/skel/.rvm "$HOME"
-fi