|
Lines 1-5
Link Here
|
| 1 |
#!/bin/sh |
1 |
#!/bin/sh |
| 2 |
# Copyright 2010, 2011, 2012, 2013 David Naylor <naylor.b.david@gmail.com>. |
2 |
# Copyright 2010 to 2015 David Naylor <dbn@FreeBSD.org> |
| 3 |
# Copyright 2012 Jan Beich <jbeich@tormail.org> |
3 |
# Copyright 2012 Jan Beich <jbeich@tormail.org> |
| 4 |
# All rights reserved. |
4 |
# All rights reserved. |
| 5 |
# |
5 |
# |
|
Lines 68-73
Link Here
|
| 68 |
# Version 1.14 - 2014/12/26 |
68 |
# Version 1.14 - 2014/12/26 |
| 69 |
# - gracefully handle a corrupt nVidia tarball |
69 |
# - gracefully handle a corrupt nVidia tarball |
| 70 |
# - provide checksum and size information for nVidia tarball |
70 |
# - provide checksum and size information for nVidia tarball |
|
|
71 |
# Version 1.15 - 2015/03/10 |
| 72 |
# - handle nvidia-driver with package name suffix |
| 73 |
# - handle i386-wine with arbitary package name suffix |
| 74 |
# - remove support for old pkg_ tools |
| 71 |
|
75 |
|
| 72 |
set -e |
76 |
set -e |
| 73 |
|
77 |
|
|
Lines 132-141
Link Here
|
| 132 |
ret=`pkg query -g '%v' $pkg || true` |
136 |
ret=`pkg query -g '%v' $pkg || true` |
| 133 |
fi |
137 |
fi |
| 134 |
|
138 |
|
| 135 |
if [ -z "$ret" ] |
|
|
| 136 |
then |
| 137 |
ret=`pkg_info -E $pkg'*' | cut -f 3 -d - || true` |
| 138 |
fi |
| 139 |
# installed manually or failed to register |
139 |
# installed manually or failed to register |
| 140 |
if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver" ] |
140 |
if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver" ] |
| 141 |
then |
141 |
then |
|
Lines 152-164
Link Here
|
| 152 |
|
152 |
|
| 153 |
if [ -z "${WINE}" ] |
153 |
if [ -z "${WINE}" ] |
| 154 |
then |
154 |
then |
| 155 |
WINE=`version i386-wine; version i386-wine-devel; version i386-wine-compholio` |
155 |
WINE=`version 'i386-wine*'` |
| 156 |
fi |
156 |
fi |
| 157 |
[ -n "$WINE" ] \ |
157 |
[ -n "$WINE" ] \ |
| 158 |
|| terminate 255 "Unable to detect i386-wine, please install first" |
158 |
|| terminate 255 "Unable to detect i386-wine, please install first" |
| 159 |
echo "=> Detected i386-wine: ${WINE}" |
159 |
echo "=> Detected i386-wine: ${WINE}" |
| 160 |
|
160 |
|
| 161 |
NV=`version nvidia-driver` |
161 |
NV=`version 'nvidia-driver*'` |
| 162 |
[ -n "$NV" ] \ |
162 |
[ -n "$NV" ] \ |
| 163 |
|| terminate 1 "Unable to detect nvidia-driver, please install first" |
163 |
|| terminate 1 "Unable to detect nvidia-driver, please install first" |
| 164 |
echo "=> Detected nvidia-driver: ${NV}" |
164 |
echo "=> Detected nvidia-driver: ${NV}" |