Introduce _system_version_full for NetBSD

rvm · Sep 10, 2013 · b3542d9 · b3542d9
1 parent 5806869
commit b3542d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/scripts/functions/requirements/netbsd b/scripts/functions/requirements/netbsd
@@ -7,8 +7,8 @@ requirements_netbsd_lib_installed()
 
 requirements_netbsd_libs_install()
 {
-  typeset _set _set_url _set_md5
-  _set_base_url="http://ftp.netbsd.org/pub/NetBSD/NetBSD-${_system_version}/${_system_arch/x86_64/amd64}/binary/sets"
+  typeset _set_base_url _set _set_url _set_md5
+  _set_base_url="http://ftp.netbsd.org/pub/NetBSD/NetBSD-${_system_version_full}/${_system_arch/x86_64/amd64}/binary/sets"
   for _set in "$@"
   do
     _set_url="${_set_base_url}/${_set}.tgz"
@@ -42,10 +42,8 @@ requirements_netbsd_custom_lib_installed()
 
 requirements_netbsd_install_custom()
 {
-  typeset _major_version
-  _major_version="$(echo ${_system_version} | __rvm_awk -F. '{print $1"."$2}')"
   __rvm_try_sudo \
-    PKG_PATH="http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/${_major_version}/All/" \
+    PKG_PATH="http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/${_system_version}/All/" \
     pkg_add "$@" || return $?
 }
 

diff --git a/scripts/functions/utility_system b/scripts/functions/utility_system
@@ -156,7 +156,8 @@ __rvm_detect_system()
     (NetBSD)
       _system_type="BSD"
       _system_name="NetBSD"
-      _system_version="$(uname -r)"
+      _system_version_full="$(uname -r)"
+      _system_version="$(echo ${_system_version_full} | \awk -F. '{print $1"."$2}')"
       ;;
     (Darwin)
       _system_type="Darwin"