[patch] Teamviewer 9 patch

teamviewer-9.0.24147-gentoo.patch (text/plain), 3.06 KB, created by Jayson Reis on 2014-01-03 19:34:06 UTC

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
-}