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

diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat
index 32f238a0d6e647be2608f36af39af467a2fef668..41f85f59ef73b83d3209129ac35efa5d4aded8e2 100644 (file)
--- a/infobase/fortunes.dat
+++ b/infobase/fortunes.dat
@@ -43050,4 +43050,32 @@ people to feel indebted to us.  Shantideva says:
 
   -- Traleg Kyabgon, from "The Practice of Lojong: Cultivating Compassion
      through Training the Mind", published by Shambhala Publications
+~
+Guru Rinpoche Padmasambhava says:
+
+        If you want to go sightseeing, try touring your own clear,
+        mirrorlike mind instead.
+
+    What technique can we use to effectively start our journey to realizing
+our natural, pristine state?
+    The clearest instructions for doing this come from Guru Rinpoche
+Padmasambhava, the main architect of the Pristine Mind teachings.  Guru
+Rinpoche has given us the essential opening instructions for practicing
+Pristine Mind meditation in four steps:
+
+         Don’t follow the past.
+         Don’t anticipate the future.
+         Remain in the present moment.
+         Leave your mind alone.
+
+    We must understand these instructions.  They are designed to help us stay
+in the present moment.  Some other forms of meditation teachings say that
+remaining in the present moment is the ultimate objective of meditation.
+However, the present moment itself is not ultimate reality, ultimate truth, or
+the ultimate goal of Pristine Mind meditation.  Nor is it what I mean when I
+refer to our fundamental nature.  Instead, being in the present moment, with
+our mind calm and relaxed, simply creates the right conditions to begin to
+connect with our Pristine Mind.
+  --Excerpted from "Our Pristine Mind: A Practical Guide to Unconditional
+    Happiness", by Orgyen Chowang, published by Shambhala Publications
 

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 189dac016546307e7e665e05f816285e4389cbf9..c60c94319e4e24d126e700465c66e9ece8edcecd 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -510,7 +510,8 @@ or if you're on cygwin, then try this (if apt-cyg is available):\n
 
     if [ -d "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" ]; then
       echo "copying custom scripts for $custom_user"
-      netcp "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" &>/dev/null
+      rsync -avz "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" &>/dev/null
+      test_or_continue "copying customization scripts"
 #hmmm: could save output to show if an error occurs.
     fi
     echo

diff --git a/scripts/customize/fred/scripts/archival/raw_surya_synch.sh b/scripts/customize/fred/scripts/archival/raw_surya_synch.sh
new file mode 100644 (file)
index 0000000..57b9472
--- /dev/null
+++ b/scripts/customize/fred/scripts/archival/raw_surya_synch.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+
+echo "Updating walrus and musix from surya: raw mode without syncthing!"
+echo
+
+for currdir in basement imaginations musix walrus; do
+  sep
+  echo "synching $currdir folder..."
+  rsync -avz surya:/z/$currdir/* /z/$currdir/
+done
+
+sep
+

diff --git a/scripts/customize/fred/scripts/archival/raw_surya_synch_.sh b/scripts/customize/fred/scripts/archival/raw_surya_synch_.sh
deleted file mode 100644 (file)
index 57b9472..0000000
--- a/scripts/customize/fred/scripts/archival/raw_surya_synch_.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
-
-echo "Updating walrus and musix from surya: raw mode without syncthing!"
-echo
-
-for currdir in basement imaginations musix walrus; do
-  sep
-  echo "synching $currdir folder..."
-  rsync -avz surya:/z/$currdir/* /z/$currdir/
-done
-
-sep
-

diff --git a/scripts/generator/jenkins_builder.sh b/scripts/generator/jenkins_builder.sh
new file mode 100644 (file)
index 0000000..a61c362
--- /dev/null
+++ b/scripts/generator/jenkins_builder.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# got really tired of seeing this as a big long single line in jenkins, plus
+# it kept breaking and was a huge pain to edit.  so now it's in a much more
+# readable file.
+# the only parameter is the path to the feisty meow codebase being built and
+# tested.
+
+feisty_path="$1"; shift
+
+if [ -z "$feisty_path" ]; then
+  echo This script requires the path to the feisty meow codebase under test.
+  exit 1
+fi
+
+export RUN_ALL_TESTS=true
+export HOME="$(mktemp -d "$feisty_path/home_store.XXXXXX")"
+cd "$feisty_path"
+export FEISTY_MEOW_APEX="$(\pwd)"
+export FEISTY_MEOW_SCRIPTS=$FEISTY_MEOW_APEX/scripts
+bash "$feisty_path/scripts/core/reconfigure_feisty_meow.sh"
+source "$feisty_path/scripts/core/launch_feisty_meow.sh"
+var FEISTY_MEOW_APEX FEISTY_MEOW_SCRIPTS
+bash "$feisty_path/scripts/generator/produce_feisty_meow.sh"
+

diff --git a/scripts/opensim/opensim_utils.sh b/scripts/opensim/opensim_utils.sh
index f10d6b95ea3e21446d39f9371ff665935968f8e1..de7dcc069f5e3a7130c68fa7f720b6170978be7d 100644 (file)
--- a/scripts/opensim/opensim_utils.sh
+++ b/scripts/opensim/opensim_utils.sh
@@ -37,9 +37,11 @@ function launch_screen()
   app_name="$1"; shift
   echo "$(date_stringer ' '): starting $screen_name now..."
 #hmmm: version check for if we're using old screen?  this -L change was a mistake though for the screen project owners on ubuntu.
-local boguslog=$HOME/screen_junk_$(date_stringer).log
-#maybe they unbroke it in 17.10?
-  screen -L $boguslog -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" 
+#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" 
 
   echo "$(date_stringer ' '): $screen_name started."
   # only sleep if we are not at the last process that gets started.