From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9346D1381F3 for ; Sat, 21 Sep 2013 19:52:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 461E9E0B7E; Sat, 21 Sep 2013 19:52:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3C56E0B7E for ; Sat, 21 Sep 2013 19:52:22 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86A1433EAE4 for ; Sat, 21 Sep 2013 19:52:21 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2322) id 4F53C2004C; Sat, 21 Sep 2013 19:52:20 +0000 (UTC) From: "Julian Ospald (hasufell)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hasufell@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-misc/teamviewer/files: teamviewer-8.0.20931-gentoo.patch teamviewer-8.0.17147-gentoo.patch teamviewer.service teamviewer-8.0.17147-POSIX.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: teamviewer-8.0.20931-gentoo.patch teamviewer-8.0.17147-gentoo.patch teamviewer.service teamviewer-8.0.17147-POSIX.patch X-VCS-Directories: net-misc/teamviewer/files X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130921195220.4F53C2004C@flycatcher.gentoo.org> Date: Sat, 21 Sep 2013 19:52:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f99097d5-bcd0-4b7f-a694-63165d17dd5b X-Archives-Hash: 1af23780a3cf5eb78f9edfb5614421f6 hasufell 13/09/21 19:52:20 Added: teamviewer-8.0.20931-gentoo.patch Removed: teamviewer-8.0.17147-gentoo.patch teamviewer.service teamviewer-8.0.17147-POSIX.patch Log: version bump, remove old (Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) Revision Changes Path 1.1 net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch?rev=1.1&content-type=text/plain Index: teamviewer-8.0.20931-gentoo.patch =================================================================== commit d3060b46b357c399d522e8346dd6c9b99c322343 Author: hasufell Date: Sat Sep 21 20:08:07 2013 +0200 remove all daemon/systemd related bits diff --git a/script/tvw_main b/script/tvw_main index bdff58b..1058d47 100644 --- a/script/tvw_main +++ b/script/tvw_main @@ -2,7 +2,6 @@ source "$TV_SCRIPT_DIR/tvw_config" source "$TV_SCRIPT_DIR/tvw_aux" -source "$TV_SCRIPT_DIR/tvw_daemon" source "$TV_SCRIPT_DIR/tvw_profile" @@ -17,7 +16,6 @@ function Main() --help ) PrintHelp ;; --version ) PrintVersion ;; --info ) PrintInfo ;; - --daemon ) Run_Daemon $opt ;; --winecfg ) shift; Run_WineCfg "$@" ;; --regedit ) shift; Run_RegEdit "$@" ;; --kill ) Run_KillTeamViewer ;; @@ -174,26 +172,14 @@ function Run_RegEdit() 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 -} - 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' ;; @@ -203,19 +189,19 @@ 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 0 ) echo "ok - license exported to '$path'" ;; @@ -223,8 +209,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() @@ -265,20 +250,12 @@ function PrintHelp() ABecho "teamviewer --passwd [PASSWD]" "set a password (useful when installing remote (ssh)" ABecho "teamviewer --ziplog" "create a zip containing all teamviewer logs (useful when contacting support)" echo - ABecho "teamviewer --daemon status" "show current status of the TeamViewer daemon" - ABecho "teamviewer --daemon start" "start TeamViewer daemon" - ABecho "teamviewer --daemon stop" "stop TeamViewer daemon" - ABecho "teamviewer --daemon restart" "stop/start TeamViewer daemon" - ABecho "teamviewer --daemon disable" "disable TeamViewer daemon - don't start daemon on system startup" - ABecho "teamviewer --daemon enable" "enable TeamViewer daemon - start daemon on system startup (default)" } function PrintInfo() { PrintVersion echo - PrintDaemonStatus - echo PrintTeamViewerID } @@ -287,15 +264,6 @@ function PrintVersion() ABecho "TeamViewer" "$TV_VERSION" } -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" @@ -307,6 +275,6 @@ function PrintTeamViewerID() 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 }