From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 8 Dec 2017 18:05:49 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~60
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=00e8a2f35de87987880cd5b46a1c7e4bee8c68dd;hp=06d706832d980410730fe62c0b8473d833cdd090;p=feisty_meow.git

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

diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat
index 32f238a0..41f85f59 100644
--- 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 189dac01..c60c9431 100644
--- 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/generator/jenkins_builder.sh b/scripts/generator/jenkins_builder.sh
new file mode 100644
index 00000000..a61c3625
--- /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"
+