diff options
author | David Hawkes <overlays@awakenedtechnologies.com> | 2014-04-05 19:36:57 -0700 |
---|---|---|
committer | David Hawkes <overlays@awakenedtechnologies.com> | 2014-04-05 19:36:57 -0700 |
commit | 3890c51168ca5416a1ca00a6b045fbb301041503 (patch) | |
tree | 8473e18b3a57b231339338ef97df9d675d5bdddd /net-misc/teamviewer/files | |
parent | Initial push (diff) | |
download | atl-3890c51168ca5416a1ca00a6b045fbb301041503.tar.gz atl-3890c51168ca5416a1ca00a6b045fbb301041503.tar.bz2 atl-3890c51168ca5416a1ca00a6b045fbb301041503.zip |
Adding net-misc/teamviewer
Diffstat (limited to 'net-misc/teamviewer/files')
-rw-r--r-- | net-misc/teamviewer/files/teamviewer-9.0.24147-gentoo.patch | 118 | ||||
-rw-r--r-- | net-misc/teamviewer/files/teamviewerd.init | 26 |
2 files changed, 144 insertions, 0 deletions
diff --git a/net-misc/teamviewer/files/teamviewer-9.0.24147-gentoo.patch b/net-misc/teamviewer/files/teamviewer-9.0.24147-gentoo.patch new file mode 100644 index 0000000..44011f6 --- /dev/null +++ b/net-misc/teamviewer/files/teamviewer-9.0.24147-gentoo.patch @@ -0,0 +1,118 @@ +diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra +index ae90b2d..f7ce7c1 100644 +--- a/opt/teamviewer9/tv_bin/script/tvw_extra ++++ b/opt/teamviewer9/tv_bin/script/tvw_extra +@@ -31,20 +31,9 @@ function PrintInfo() + { + PrintVersion + echo +- PrintDaemonStatus +- echo + PrintTeamViewerID + } + +-function PrintDaemonStatus() +-{ +- local cmd="$(daemonCtl 'status')" +- local txt="$(eval "$cmd")" +- [ $? = 0 ] || txt='n/a (error)' +- +- ABecho "teamviewerd status" "$txt" +-} +- + function PrintTeamViewerID() + { + local config="$TV_BASE_DIR/config/global.conf" +@@ -55,18 +44,18 @@ function PrintTeamViewerID() + if [ -n "$tvid" ]; then + ABecho "TeamViewer ID:" "$tvid" + else +- echo "TeamViewer ID: not found" +- echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)" ++ echo "Try restarting the TeamViewer daemon." + fi + } + + function SetPasswd() + { ++ echo "Stop your teamviewer daemon first, then press enter." ++ read ++ + local pwd="$1" + [ -n "$pwd" ] || die 'no password specified' + +- Run_Daemon 'stop' > /dev/null +- + $TV_BIN_DIR/teamviewerd --passwd "$pwd" + case $? in + 0 ) echo 'ok' ;; +@@ -76,18 +65,18 @@ function SetPasswd() + * ) echo 'unknown response' ;; + esac + +- Run_Daemon 'start' || die 'failed to restart the daemon' +- echo ++ echo "You may start your teamviewer daemon again." + } + + function ExportLicense() + { ++ echo "Stop your teamviewer daemon first, then press enter." ++ read ++ + local license="$1" + local path='/tmp/tv_global.conf' + + [ -n "$license" ] || die 'no license specified' +- +- Run_Daemon 'stop' > /dev/null + + $TV_BIN_DIR/teamviewerd --export-license "$license" "$path" + case $? in +@@ -96,8 +85,7 @@ function ExportLicense() + * ) echo 'unknown response' ;; + esac + +- Run_Daemon 'start' || die 'failed to restart the daemon' +- echo ++ echo "You may start your teamviewer daemon again." + } + + function CreateZipLog() +diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main +index cb4553a..7fe6571 100644 +--- a/opt/teamviewer9/tv_bin/script/tvw_main ++++ b/opt/teamviewer9/tv_bin/script/tvw_main +@@ -4,7 +4,6 @@ source "$TV_SCRIPT_DIR/tvw_aux" + source "$TV_SCRIPT_DIR/tvw_config" + source "$TV_SCRIPT_DIR/tvw_exec" + source "$TV_SCRIPT_DIR/tvw_extra" +-source "$TV_SCRIPT_DIR/tvw_daemon" + source "$TV_SCRIPT_DIR/tvw_profile" + + +@@ -19,7 +18,6 @@ function Main() + --help ) PrintHelp ;; + --version ) PrintVersion ;; + --info ) PrintInfo ;; +- --daemon ) Run_Daemon $opt ;; + --winecfg ) shift; Run_WineCfg "$@" ;; + --regedit ) shift; Run_RegEdit "$@" ;; + --kill ) Run_KillTeamViewer ;; +@@ -149,16 +147,3 @@ function Run_RegEdit() + Init + wine regedit "$@" + } +- +-function Run_Daemon() +-{ +- local opt="$1" +- +- case "$opt" in +- ( disable ) removeDaemon || rootSuggest ;; +- ( enable ) installDaemon || rootSuggest ;; +- ( start | stop | restart ) cmdDaemon $opt || rootSuggest ;; +- ( status ) cmdDaemon $opt ;; +- ( * ) echo "unknown option '$opt'" ;; +- esac +-} diff --git a/net-misc/teamviewer/files/teamviewerd.init b/net-misc/teamviewer/files/teamviewerd.init new file mode 100644 index 0000000..e45c5c0 --- /dev/null +++ b/net-misc/teamviewer/files/teamviewerd.init @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init,v 1.2 2013/04/18 13:08:45 hasufell Exp $ + +description="daemon for TeamViewer" + +PIDFILE="/var/run/teamviewerd.pid" + +start() { + ebegin "Starting Teamviewer Daemon" + + start-stop-daemon \ + --start \ + --pidfile "${PIDFILE}" \ + --background \ + --exec /opt/teamviewer@TVV@/teamviewerd -- -d +} + +stop() { + ebegin "Stopping Teamviewer Daemon" + + start-stop-daemon \ + --stop \ + --pidfile "${PIDFILE}" +} |