Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index eec83fb4d673eca7cfef031d85c55b9728055658..77e2091f65d9b969c45fb019baffe6532539e461 100644 (file)
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=106
+revision=108
 build=420
 
 # specifies the remainder of the version record info.

diff --git a/scripts/generator/jenkins_builder.sh b/scripts/generator/jenkins_builder.sh
index a61c3625bd010bf704194d20efd59984b9bc152f..3b67d6e38afa9c3a6b40100d76ba20d4bc2ed0e4 100644 (file)
--- a/scripts/generator/jenkins_builder.sh
+++ b/scripts/generator/jenkins_builder.sh
@@ -14,6 +14,10 @@ if [ -z "$feisty_path" ]; then
 fi
 
 export RUN_ALL_TESTS=true
+# clean up any old home storage paths.
+\rm -rf "$feisty_path/home_store".*
+# set home folder to a new home_store.random folder, for anything that
+# feisty meow needs to store under $HOME.
 export HOME="$(mktemp -d "$feisty_path/home_store.XXXXXX")"
 cd "$feisty_path"
 export FEISTY_MEOW_APEX="$(\pwd)"

diff --git a/scripts/opensim/opensim_utils.sh b/scripts/opensim/opensim_utils.sh
index 431c85a61a2b012225c3839ae18a2d412092ffcf..130e9cddd56dcd34400044721a835535040c957c 100644 (file)
--- a/scripts/opensim/opensim_utils.sh
+++ b/scripts/opensim/opensim_utils.sh
@@ -41,7 +41,8 @@ local boguslog=$HOME/screen_junk_$(date_stringer).log
 #maybe they unbroke it in 17.10?  yes, but it requires NO space now.  *&@#*&@#
 #hmmm: bring back old version but check for ubuntu 17.04 vs 17.10 now.
 #actually they made it a new parm.  arghhh!
-  screen -L $boguslog -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" 
+  screen -L -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" 
+#$boguslog 
 
   echo "$(date_stringer ' '): $screen_name started."
   # only sleep if we are not at the last process that gets started.

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 0c8cec27eb097936b340c611d8c7bda5fbf27b7a..b96bcb3431fe55aa4f7bb478bc85e3300a08cd6b 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -411,7 +411,7 @@ function do_careful_git_update()
     remote_branch_info=$(git ls-remote --heads origin $bran 2>/dev/null)
     if [ ! -z "$remote_branch_info" ]; then
       # we are pretty sure the remote branch does exist.
-      git pull $PULL_ADDITION origin "$bran" | $TO_SPLITTER
+      git pull --tags $PULL_ADDITION origin "$bran" | $TO_SPLITTER
 # we may want to choose to do fast forward, to avoid crazy multiple merge histories
 # without any changes in them.  --no-ff
       promote_pipe_return 0
@@ -425,7 +425,7 @@ function do_careful_git_update()
 
   # now pull down any changes in our own origin in the repo, to stay in synch
   # with any changes from others.
-  git pull $PULL_ADDITION --all | $TO_SPLITTER
+  git pull --tags $PULL_ADDITION --all | $TO_SPLITTER
 #is the above really important when we did this branch already in the loop?
 #it does an --all, but is that effective or different?  should we be doing that in above loop?
 # --no-ff   
@@ -467,7 +467,7 @@ function do_update()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
-      git pull $PULL_ADDITION 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      git pull --tags $PULL_ADDITION 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
 #ordinary pulls should be allowed to do fast forward: --no-ff 
       promote_pipe_return 0
       test_or_die "git pull of origin"