From 66da892f0eed57eafaa9fd265ed49162f2a645c9 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 5 Mar 2012 22:39:08 -0500 Subject: [PATCH] updated to correct some misapprehensions about how well gvim would work as an editor for svn and git checkins. answer: not at all well. no editor that comes back before editing is complete will work properly for git and svn. --- examples/custom_overrides/fred/fred_variables.sh | 8 ++++++-- scripts/core/variables.sh | 5 ----- scripts/opensim/opensim_utils.sh | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/examples/custom_overrides/fred/fred_variables.sh b/examples/custom_overrides/fred/fred_variables.sh index e7c97e7a..974171dc 100644 --- a/examples/custom_overrides/fred/fred_variables.sh +++ b/examples/custom_overrides/fred/fred_variables.sh @@ -37,8 +37,12 @@ export VISUAL="$(which gvim)" if [ $? -ne 0 ]; then export VISUAL="$(which vi)" fi -export EDITOR="$VISUAL" - +export EDITOR="$(which vi)" +# the editors for revision control must wait while document is edited, +# so gvim and others launched to x window are not appropriate. +export GIT_EDITOR="$EDITOR" +export SVN_EDITOR="$EDITOR" + # this hideous mess is necessitated by our not having found the source of the # settings yet. we override a few colors that look bad on a dark background. export LS_COLORS='no=00:fi=00:di=01;37:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;35:*.rpm=00;33:*.deb=00;33:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.zip=00;35:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;35:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index c979f320..d71d6a43 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -119,11 +119,6 @@ if [ -z "$NECHUNG" ]; then # names can be added in your customized scripts. export REPOSITORY_LIST="feisty_meow" - # set the editor for subversion if it hasn't already been set. - if [ -z "$SVN_EDITOR" ]; then - export SVN_EDITOR=$(which gvim) - fi - # initializes the feisty meow build variables, if possible. function initialize_build_variables() { diff --git a/scripts/opensim/opensim_utils.sh b/scripts/opensim/opensim_utils.sh index e6bb9681..2065886b 100644 --- a/scripts/opensim/opensim_utils.sh +++ b/scripts/opensim/opensim_utils.sh @@ -33,11 +33,11 @@ function launch_screen() { screen_name="$1"; shift app_name="$1"; shift - echo "$(mdate): starting $screen_name now..." + echo "$(date_stringer): starting $screen_name now..." screen -L -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" ##why? --debug #-console=basic - echo "$(mdate): $screen_name started." + echo "$(date_stringer): $screen_name started." sleep $SNOOZE_TIME } @@ -60,13 +60,13 @@ function close_application() { screen_name="$1"; shift process_name="$1"; shift - echo "$(mdate): stopping $screen_name now..." + echo "$(date_stringer): stopping $screen_name now..." screen -r -s "$screen_name" -X quit # we don't want to shut any other servers down until this process is really gone. find_opensim_process $process_name if [ ! -z "$OS_PROC_ID" ]; then - echo "$(mdate): waiting for $screen_name to really shut down..." + echo "$(date_stringer): waiting for $screen_name to really shut down..." sleep $SNOOZE_TIME # check again after the snooze. find_opensim_process $process_name @@ -74,7 +74,7 @@ function close_application() find_opensim_process $process_name #break out on timed basis. done - echo "$(mdate): $screen_name really is shut down now." + echo "$(date_stringer): $screen_name really is shut down now." #do this as last ditch, above in timeout find_opensim_process $process_name @@ -86,6 +86,6 @@ function close_application() fi - echo "$(mdate): $screen_name stopped." + echo "$(date_stringer): $screen_name stopped." } -- 2.34.1