From 89bbd8fff37ad9c060c989b07fb6d2fb87972a7d Mon Sep 17 00:00:00 2001
From: Chris Koeritz
Date: Fri, 10 Nov 2017 18:36:20 -0500
Subject: [PATCH] tasty changes for going live
new folder for default install /opt/feistymeow.org/feisty_meow.
code and docs scrubbed for references to ~/feisty_meow and /usr/local/fred.
new variable for the feisty meow org applications (including feisty_meow codebase).
---
documentation/clam_manual/clam_docs.html | 4 ++--
.../cron/aa_cron_defaults.crontab | 10 ++++-----
.../quake3/quake3_server_start.txt | 2 +-
readme.txt | 22 ++++++++-----------
scripts/core/generate_aliases.pl | 2 +-
scripts/core/launch_feisty_meow.sh | 5 ++---
scripts/core/variables.sh | 3 +++
scripts/customize/fred/refred.sh | 8 ++++++-
scripts/files/edit_files_matching.sh | 4 ++--
scripts/generator/build_variables.sh | 4 ++--
10 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/documentation/clam_manual/clam_docs.html b/documentation/clam_manual/clam_docs.html
index 6872a4e1..b5380512 100644
--- a/documentation/clam_manual/clam_docs.html
+++ b/documentation/clam_manual/clam_docs.html
@@ -646,7 +646,7 @@
are
generated. All files generated by compilation are stored in the
repository
- directory (by default, either "~/feisty_meow" in Linux or "l:\" in
+ directory (by default, either "/opt/feistymeow.org/feisty_meow" in Linux or "l:\" in
win32). There are three TYPEs supported so far:
@@ -671,7 +671,7 @@
be given
an include directory named after the project, such as
- "~/feisty_meow/include/basis".
+ "/opt/feistymeow.org/feisty_meow/include/basis".
The include directory is created as a copy of the headers in the
project's
directory . Library projects will also have their final products
diff --git a/infobase/configuration/cron/aa_cron_defaults.crontab b/infobase/configuration/cron/aa_cron_defaults.crontab
index 375d1d38..51a73ff4 100644
--- a/infobase/configuration/cron/aa_cron_defaults.crontab
+++ b/infobase/configuration/cron/aa_cron_defaults.crontab
@@ -14,16 +14,16 @@
# HOME, which is pretty lucky for us...
# please change the name to the user running the cronjob, or to whatever
# unique string you'd like to use:
-CRONUSER=FILL_CRONUSER_HERE
+CRONUSER=FILL-CRONUSER-HERE
# set the shell to bash. (not the default for some cron implementations.)
SHELL=/bin/bash
-# set the top-level folder for feisty meow here, since cron gets almost
-# nothing from the user's environment. this folder needs to be updated for
-# your own particular install location.
+# set the top-level folder for feisty meow here; important because cron gets
+# almost nothing from the user's environment. this folder needs to be updated
+# for your own particular install location.
+FEISTY_MEOW_APEX=/opt/feistymeow.org/feisty_meow
#FEISTY_MEOW_APEX=$HOME/feisty_meow
-FEISTY_MEOW_APEX=/usr/local/fred/feisty_meow
# crontab miniature docs:
#
diff --git a/infobase/configuration/quake3/quake3_server_start.txt b/infobase/configuration/quake3/quake3_server_start.txt
index ef4e9bb5..a498a3a4 100644
--- a/infobase/configuration/quake3/quake3_server_start.txt
+++ b/infobase/configuration/quake3/quake3_server_start.txt
@@ -10,6 +10,6 @@ that i don't know but which i have heard of.
this just automates the copying of the config file before running quake.
-cp ~/feisty_meow/infobase/quake3/fred_free_for_all.cfg /usr/local/games/quake3/baseq3/ ; nohup quake3 +set dedicated 1 +exec fred_free_for_all.cfg
+cp $FEISTY_MEOW_APEX/infobase/quake3/fred_free_for_all.cfg /usr/local/games/quake3/baseq3/ ; nohup quake3 +set dedicated 1 +exec fred_free_for_all.cfg
diff --git a/readme.txt b/readme.txt
index c089a4e7..0fda046e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,20 +6,21 @@ Quick Start Guide for the Feisty Meow Codebase
Commands that can be typed in a console or terminal are are prefixed with "#".
Information that varies by platform is prefixed with a '|' character.
+This documentation assumes that the code is stored in the default location:
+ /opt/feistymeow.org/feistymeow
+If you have stored it elsewhere, then please adapt the commands accordingly.
+
==============
How to get the feisty meow codebase
| On Microsoft Windows, install the Cygwin tools as documented here:
-| ~/feisty_meow/documentation/cygwin_install_list.txt (local file) or
+| /opt/feistymeow.org/feisty_meow/documentation/cygwin_install_list.txt (local file) or
| https://feistymeow.org/feisty_meow/documentation/cygwin_install_list.txt (web)
Retrieve a clone of the feisty meow codebase:
# git clone git://feistymeow.org/feisty_meow
-The remainder of these notes assume that the code is stored in:
- ~/feisty_meow (aka $HOME/feisty_meow).
-
==============
How to load the feisty meow script environment
@@ -27,17 +28,17 @@ How to load the feisty meow script environment
Set up the feisty_meow scripts; this is only needed once, when you first get
the codebase. It will also regenerate the scripts using the latest installed
version.
-# bash ~/feisty_meow/scripts/core/reconfigure_feisty_meow.sh
+# bash /opt/feistymeow.org/feisty_meow/scripts/core/reconfigure_feisty_meow.sh
Connect the feisty meow scripts to your login script (in ~/.bashrc).
Note that this actually modifies ~/.bashrc. This step is only needed once.
-# bash ~/feisty_meow/scripts/core/connect_feisty_meow.sh
+# bash /opt/feistymeow.org/feisty_meow/scripts/core/connect_feisty_meow.sh
Load the script environment into the current shell. This can be done for
any new shell. This is idempotent, so it does no harm to run it again.
Note that you should not need this step if you connected feisty meow to
~/.bashrc above.
-# source ~/feisty_meow/scripts/core/launch_feisty_meow.sh
+# source /opt/feistymeow.org/feisty_meow/scripts/core/launch_feisty_meow.sh
When the feisty meow script environment loaded, many new aliases and
functions are available for use. These come from the $FEISTY_MEOW_SCRIPTS
@@ -72,10 +73,6 @@ in the "nucleus", "octopi", "graphiq" and other C++ collections.
| Centos / Redhat / Fedora:
| # sudo yum install gcc gcc-c++ openssl-devel.x86_64 curl-devel
-| Microsoft Windows:
-| Download and install the Cygwin environment first from cygwin.com, which is
-| documented in ~/feisty_meow/documentation/cygwin_install_list.txt
-
The "kona" collection depends on Java version 8 or better.
| Ubuntu:
@@ -90,8 +87,7 @@ Run the following command to build the feisty meow libraries and applications.
# produce_feisty_meow
After the build is complete, the feisty meow applications can be found in
-$FEISTY_MEOW_BINARIES (environment variable).
-# ls $FEISTY_MEOW_BINARIES
+the folder pointed at by the $FEISTY_MEOW_BINARIES environment variable.
==============
diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl
index 45ff8118..a9c40435 100644
--- a/scripts/core/generate_aliases.pl
+++ b/scripts/core/generate_aliases.pl
@@ -147,7 +147,7 @@ if ( ! length("$FEISTY_MEOW_LOADING_DOCK") ) {
The FEISTY_MEOW_LOADING_DOCK variable is not defined. This must point to\
the location where the generated scripts are stored. You may still need to\
configure the feisty meow script system with something like:\
- bash ~/feisty_meow/scripts/core/reconfigure_feisty_meow.sh\
+ bash /opt/feistymeow.org/feisty_meow/scripts/core/reconfigure_feisty_meow.sh\
Please see http://feistymeow.org for more details.\n";
exit 1;
#really need to use better exit codes.
diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 8b07cc3b..82eb5a7f 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -44,11 +44,10 @@ if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then
# make sure our main variables are established.
FEISTY_MEOW_VARIABLES_LOADING_FILE="$FEISTY_MEOW_LOADING_DOCK/fmc_variables.sh"
if [ ! -f "$FEISTY_MEOW_VARIABLES_LOADING_FILE" ]; then
- echo -e '\n\n'
- example_dir="/usr/local/fred"
echo -e "\
+
The feisty meow scripts need initialization via the bootstrap process. For\n\
-example, if the feisty meow folder lives in '$example_dir', then this\n\
+example, if the feisty meow folder lives in '$DEFAULT_FEISTYMEOW_ORG_DIR', then this\n\
command bootstraps feisty meow:\n\
\n\
bash $example_dir/feisty_meow/scripts/core/reconfigure_feisty_meow.sh\n\
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 976c7898..81d80d76 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -56,6 +56,9 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then
# start with some simpler things.
+#hmmm: this needs to come from some configuration item. especially for installs.
+define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
+
define_yeti_variable SCRIPT_SYSTEM=feisty_meow
# OS variable records the operating system we think we found.
diff --git a/scripts/customize/fred/refred.sh b/scripts/customize/fred/refred.sh
index 088e8e3b..3b671bd7 100644
--- a/scripts/customize/fred/refred.sh
+++ b/scripts/customize/fred/refred.sh
@@ -15,8 +15,14 @@ function refred()
done
#echo arch addin now is: $arch_addin
+ # special case that makes our software hierarchy folder, if it doesn't exist.
+ # everything else is only re-permed if it exists.
+ if [ ! -d "$DEFAULT_FEISTYMEOW_ORG_DIR" ]; then
+ sudo mkdir
+ fi
+
# iterate across the list of dirs we want fred to own and change their ownership.
- for dirname in /home/fred /opt/feistymeow.org /usr/local/fred /home/games $arch_addin; do
+ for dirname in /home/fred $DEFAULT_FEISTYMEOW_ORG_DIR /usr/local/fred /home/games $arch_addin; do
if [ -d "$dirname" ]; then
echo "refred on '$dirname'"
sudo chown -R fred:fred $dirname
diff --git a/scripts/files/edit_files_matching.sh b/scripts/files/edit_files_matching.sh
index 98c57ed5..31662a3f 100644
--- a/scripts/files/edit_files_matching.sh
+++ b/scripts/files/edit_files_matching.sh
@@ -10,8 +10,8 @@ function print_instructions()
echo "for example:"
- echo " $(basename $0 .sh) ~/feisty_meow hoople.net hoople.org"
- echo "the above will search the directory ~/feisty_meow for all matches to"
+ echo " $(basename $0 .sh) $FEISTY_MEOW_APEX hoople.net hoople.org"
+ echo "the above will search the directory $FEISTY_MEOW_APEX for all matches to"
echo "the two patterns 'hoople.org' and 'hoople.net'."
exit 1
diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index 3139aac7..c8a4c3ec 100644
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -9,12 +9,12 @@
# building the source code. It can either be run as a bash script directly
# like so:
#
-# bash ~/feisty_meow/scripts/generator/build_variables.sh
+# bash $FEISTY_MEOW_APEX/scripts/generator/build_variables.sh
#
# which will establish a new shell containing all the variables, or you can
# 'source' the script like so:
#
-# build_vars=~/feisty_meow/scripts/generator/build_variables.sh
+# build_vars=$FEISTY_MEOW_APEX/scripts/generator/build_variables.sh
# source $build_vars $build_vars
#
# to set all of the variables in your current shell. The full path is
--
2.34.1