Attachment 154163 Details for Bug 198497 – Fix nvidia.sh

[patch] Fix nvidia.sh

patch-nvidia.sh (text/plain), 1.46 KB, created by David Naylor on 2015-03-10 19:53:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Naylor

Created: 2015-03-10 19:53:24 UTC

Size: 1.46 KB

patch

obsolete

>Index: nvidia.sh
>===================================================================
>--- nvidia.sh	(revision 380288)
>+++ nvidia.sh	(working copy)
>@@ -1,5 +1,5 @@
> #!/bin/sh
>-# Copyright 2010, 2011, 2012, 2013 David Naylor <naylor.b.david@gmail.com>.
>+# Copyright 2010 to 2015 David Naylor <dbn@FreeBSD.org>
> # Copyright 2012 Jan Beich <jbeich@tormail.org>
> #       All rights reserved.
> #
>@@ -68,6 +68,10 @@
> # Version 1.14 - 2014/12/26
> #  - gracefully handle a corrupt nVidia tarball
> #  - provide checksum and size information for nVidia tarball
>+# Version 1.15 - 2015/03/10
>+#  - handle nvidia-driver with package name suffix
>+#  - handle i386-wine with arbitary package name suffix
>+#  - remove support for old pkg_ tools
> 
> set -e
> 
>@@ -132,10 +136,6 @@
>     ret=`pkg query -g '%v' $pkg || true`
>   fi
> 
>-  if [ -z "$ret" ]
>-  then
>-    ret=`pkg_info -E $pkg'*' | cut -f 3 -d - || true`
>-  fi
>   # installed manually or failed to register
>   if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver" ]
>   then
>@@ -152,13 +152,13 @@
> 
> if [ -z "${WINE}" ]
> then
>-  WINE=`version i386-wine; version i386-wine-devel; version i386-wine-compholio`
>+  WINE=`version 'i386-wine*'`
> fi
> [ -n "$WINE" ] \
>   || terminate 255 "Unable to detect i386-wine, please install first"
> echo "=> Detected i386-wine: ${WINE}"
> 
>-NV=`version nvidia-driver`
>+NV=`version 'nvidia-driver*'`
> [ -n "$NV" ] \
>   || terminate 1 "Unable to detect nvidia-driver, please install first"
> echo "=> Detected nvidia-driver: ${NV}"

Actions: View | Diff

Attachments on bug 198497: 154149 | 154163