[patch] Teamviewer 9 patch

teamviewer9.patch (text/plain), 3.80 KB, created by Jayson Reis on 2014-05-13 14:29:14 UTC

diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra
index 71164aa..848cd25 100644
--- a/opt/teamviewer9/tv_bin/script/tvw_extra
+++ b/opt/teamviewer9/tv_bin/script/tvw_extra
@@ -16,13 +16,6 @@ function PrintHelp()
   isInstalledTV || return
   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
   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)"
-  echo
 }
 
 function PrintVersion()
@@ -39,19 +32,6 @@ function PrintInfo()
   PrintTeamViewerID
 }
 
-function PrintDaemonStatus()
-{
-  local cmd="$(daemonCtl 'status')"
-  local txt="n/a"
-
-  if [ isInstalledTV ] ; then
-    txt="$(eval "$cmd")"
-    [ $? = 0 ] || txt='n/a (error)'
-  fi
-  
-  ABecho "teamviewerd status" "$txt"
-}
-
 function PrintTeamViewerID()
 {
   local config="$TV_BASE_DIR/config/global.conf"
@@ -64,16 +44,17 @@ function PrintTeamViewerID()
   ABecho "TeamViewer ID:" "$tvid"
 
   if [ -z "$tvid" ] && isInstalledTV; then
-    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
@@ -84,19 +65,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'"		;;
@@ -104,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 StripPersonalInformation()
diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main
index 8984db0..c6dff8d 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		;;
@@ -166,18 +164,3 @@ function Run_RegEdit()
   Init
   wine regedit "$@"
 }
-
-function Run_Daemon()
-{
-  local opt="$1"
-  
-  installedTVorDie
-
-  case "$opt" in
-    ( disable )					removeDaemon	|| rootSuggest	;;
-    ( enable  )					installDaemon	|| rootSuggest	;;
-    ( start | stop | restart )	cmdDaemon $opt	|| rootSuggest	;;
-    ( status )					cmdDaemon $opt					;;
-    ( * )						echo "unknown option '$opt'"	;;
-  esac
-}