| 1 |
np-hardass 15/06/30 19:49:11 |
| 2 |
|
| 3 |
Modified: teamviewer.sh |
| 4 |
Log: |
| 5 |
Remove PID location edit in systemd service file. Resolves bug #552564 |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 18F89C67) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-misc/teamviewer/files/teamviewer.sh |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: teamviewer.sh |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- teamviewer.sh 18 Jun 2015 08:35:17 -0000 1.1 |
| 23 |
+++ teamviewer.sh 30 Jun 2015 19:49:11 -0000 1.2 |
| 24 |
@@ -1,15 +1,26 @@ |
| 25 |
#!/bin/bash |
| 26 |
|
| 27 |
tv="$(basename $0)" |
| 28 |
+tvdir="/opt/${tv}" |
| 29 |
version="@TVV@" |
| 30 |
tvw_version="" |
| 31 |
prefix="${HOME}/.wine-${tv}" |
| 32 |
arch="win32" |
| 33 |
native=true |
| 34 |
|
| 35 |
+if $native; then |
| 36 |
+ export WINEDLLPATH="${prefix}/drive_c/TeamViewer" |
| 37 |
+else |
| 38 |
+ export WINEDLLPATH="${tvdir}/tv_bin/wine/lib:${tvdir}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer" |
| 39 |
+ export PATH="${tvdir}/tv_bin/wine/bin:${PATH}" |
| 40 |
+fi |
| 41 |
+export WINEARCH="${arch}" |
| 42 |
+export WINEPREFIX="${prefix}" |
| 43 |
+ |
| 44 |
if [ ! -d "${prefix}" ]; then |
| 45 |
echo "Creating prefix..." |
| 46 |
- env WINEARCH="${arch}" WINEPREFIX="${prefix}" wineboot -i &> /dev/null |
| 47 |
+ wineboot -i &> /dev/null |
| 48 |
+ mkdir -p "${prefix}/drive_c/TeamViewer" |
| 49 |
fi |
| 50 |
|
| 51 |
if [ -e "${prefix}/tvw-version" ]; then |
| 52 |
@@ -19,25 +30,18 @@ |
| 53 |
#If version has changed or new instance |
| 54 |
if [ "${version}" != "${tvw_version}" ]; then |
| 55 |
echo "Copying TeamViewer files to prefix..." |
| 56 |
- cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/TeamViewer" |
| 57 |
+ cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/" |
| 58 |
echo "Creating config and log directories in ~/.config/teamviewer@TVMV@" |
| 59 |
mkdir -p "${HOME}"/.config/teamviewer@TVMV@/{config,logfiles} |
| 60 |
echo "${version}" > "${prefix}/tvw-version" |
| 61 |
fi |
| 62 |
|
| 63 |
-TV_BASE_DIR="${tv}" |
| 64 |
+TV_BASE_DIR="${tvdir}" |
| 65 |
TV_BIN_DIR="${TV_BASE_DIR}/tv_bin" |
| 66 |
TV_PROFILE="${prefix}" |
| 67 |
TV_LOG_DIR="${TV_PROFILE}/logfiles" |
| 68 |
TV_CFG_DIR="${TV_PROFILE}/config" |
| 69 |
TV_USERHOME="${HOME}" |
| 70 |
|
| 71 |
-if $native; then |
| 72 |
- export WINEDLLPATH="${prefix}/drive_c/TeamViewer" |
| 73 |
-else |
| 74 |
- export WINEDLLPATH="${tv}/tv_bin/wine/lib:${tv}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer" |
| 75 |
- export PATH="${tv}/tv_bin/wine/bin:${PATH}" |
| 76 |
-fi |
| 77 |
-export WINEPREFIX="${prefix}" |
| 78 |
wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> \ |
| 79 |
"${HOME}/.config/teamviewer@TVMV@/logfiles/$(date +%Y.%m.%d-%H:%M:%S)-wine.log" |
Archives