np-hardass 15/06/30 19:49:11 Modified: teamviewer.sh Log: Remove PID location edit in systemd service file. Resolves bug #552564 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 18F89C67)
Revision Changes Path 1.2 net-misc/teamviewer/files/teamviewer.sh file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh?r1=1.1&r2=1.2 Index: teamviewer.sh =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewer.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- teamviewer.sh 18 Jun 2015 08:35:17 -0000 1.1 +++ teamviewer.sh 30 Jun 2015 19:49:11 -0000 1.2 @@ -1,15 +1,26 @@ #!/bin/bash tv="$(basename $0)" +tvdir="/opt/${tv}" version="@TVV@" tvw_version="" prefix="${HOME}/.wine-${tv}" arch="win32" native=true +if $native; then + export WINEDLLPATH="${prefix}/drive_c/TeamViewer" +else + export WINEDLLPATH="${tvdir}/tv_bin/wine/lib:${tvdir}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer" + export PATH="${tvdir}/tv_bin/wine/bin:${PATH}" +fi +export WINEARCH="${arch}" +export WINEPREFIX="${prefix}" + if [ ! -d "${prefix}" ]; then echo "Creating prefix..." - env WINEARCH="${arch}" WINEPREFIX="${prefix}" wineboot -i &> /dev/null + wineboot -i &> /dev/null + mkdir -p "${prefix}/drive_c/TeamViewer" fi if [ -e "${prefix}/tvw-version" ]; then @@ -19,25 +30,18 @@ #If version has changed or new instance if [ "${version}" != "${tvw_version}" ]; then echo "Copying TeamViewer files to prefix..." - cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/TeamViewer" + cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/" echo "Creating config and log directories in ~/.config/teamviewer@TVMV@" mkdir -p "${HOME}"/.config/teamviewer@TVMV@/{config,logfiles} echo "${version}" > "${prefix}/tvw-version" fi -TV_BASE_DIR="${tv}" +TV_BASE_DIR="${tvdir}" TV_BIN_DIR="${TV_BASE_DIR}/tv_bin" TV_PROFILE="${prefix}" TV_LOG_DIR="${TV_PROFILE}/logfiles" TV_CFG_DIR="${TV_PROFILE}/config" TV_USERHOME="${HOME}" -if $native; then - export WINEDLLPATH="${prefix}/drive_c/TeamViewer" -else - export WINEDLLPATH="${tv}/tv_bin/wine/lib:${tv}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer" - export PATH="${tv}/tv_bin/wine/bin:${PATH}" -fi -export WINEPREFIX="${prefix}" wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> \ "${HOME}/.config/teamviewer@TVMV@/logfiles/$(date +%Y.%m.%d-%H:%M:%S)-wine.log"
