From 25693b7a3600927bd19e83be261646657abc2eda Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sun, 29 Jan 2012 15:47:17 -0500 Subject: [PATCH] cleaning and moving a lot of files. --- .../configuration}/jenkins/empty_parsing_rules.txt | 0 .../jenkins/hoople_unit_parsing_rules.txt | 0 docs/perl_tools.html | 2 +- makefile | 2 +- scripts/core/common.alias | 2 +- scripts/core/date_stringer.sh | 10 ---------- scripts/core/functions.sh | 4 ++++ scripts/core/get_parent_dir.sh | 11 ----------- scripts/{ => examples}/legacy/template.pl | 0 scripts/tty/keep_awake_process.sh | 2 +- scripts/{core => users}/byejob.sh | 2 +- scripts/{core => users}/byemessage.sh | 0 scripts/{core => users}/goodbye.sh | 4 ++-- {scripts/web => webby}/javascript/dtree/dtree.css | 0 {scripts/web => webby}/javascript/dtree/dtree.js | 0 .../web => webby}/javascript/gruntose/gruntomote.js | 0 .../web => webby}/javascript/gruntose/launchers.js | 0 .../web => webby}/javascript/gruntose/norse_date.js | 0 .../web => webby}/javascript/gruntose/show_file.js | 0 .../web => webby}/javascript/jquery/jquery-1.5.1.js | 0 20 files changed, 11 insertions(+), 28 deletions(-) rename {scripts => database/configuration}/jenkins/empty_parsing_rules.txt (100%) rename {scripts => database/configuration}/jenkins/hoople_unit_parsing_rules.txt (100%) delete mode 100644 scripts/core/date_stringer.sh delete mode 100644 scripts/core/get_parent_dir.sh rename scripts/{ => examples}/legacy/template.pl (100%) rename scripts/{core => users}/byejob.sh (95%) rename scripts/{core => users}/byemessage.sh (100%) rename scripts/{core => users}/goodbye.sh (60%) rename {scripts/web => webby}/javascript/dtree/dtree.css (100%) rename {scripts/web => webby}/javascript/dtree/dtree.js (100%) rename {scripts/web => webby}/javascript/gruntose/gruntomote.js (100%) rename {scripts/web => webby}/javascript/gruntose/launchers.js (100%) rename {scripts/web => webby}/javascript/gruntose/norse_date.js (100%) rename {scripts/web => webby}/javascript/gruntose/show_file.js (100%) rename {scripts/web => webby}/javascript/jquery/jquery-1.5.1.js (100%) diff --git a/scripts/jenkins/empty_parsing_rules.txt b/database/configuration/jenkins/empty_parsing_rules.txt similarity index 100% rename from scripts/jenkins/empty_parsing_rules.txt rename to database/configuration/jenkins/empty_parsing_rules.txt diff --git a/scripts/jenkins/hoople_unit_parsing_rules.txt b/database/configuration/jenkins/hoople_unit_parsing_rules.txt similarity index 100% rename from scripts/jenkins/hoople_unit_parsing_rules.txt rename to database/configuration/jenkins/hoople_unit_parsing_rules.txt diff --git a/docs/perl_tools.html b/docs/perl_tools.html index 4349555f..5c2c932e 100644 --- a/docs/perl_tools.html +++ b/docs/perl_tools.html @@ -225,7 +225,7 @@ is created under the home directory (or under TMP in DOS and Win32) as a storage place for the generated files.

-

goodbye.pl

+

goodbye.pl

A logout script for exiting from a shell; it prints a message using the nechung oracle for the user's benefit and starts a byejob before exiting. The byejob will wait for a few seconds, then diff --git a/makefile b/makefile index d775b5ab..f22e7a4e 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ include variables.def PROJECT = feisty_meow_sources -BUILD_BEFORE = start_make nucleus scripts octopi graphiq production end_make +BUILD_BEFORE = start_make nucleus scripts octopi graphiq webby production end_make include rules.def diff --git a/scripts/core/common.alias b/scripts/core/common.alias index 914843ca..0c7efcc3 100644 --- a/scripts/core/common.alias +++ b/scripts/core/common.alias @@ -43,7 +43,7 @@ alias xtroff='xtroff $myxflags' #hmmm: move these to the custom area? # Standard CAK aliases that add to or extend Unix commands. -alias bye='. $FEISTY_MEOW_SCRIPTS/core/goodbye.sh' +alias bye='. $FEISTY_MEOW_SCRIPTS/users/goodbye.sh' alias calc='kcalc' alias cls='clear_colormap; clear' if [ "$OS" != "Windows_NT" ]; then diff --git a/scripts/core/date_stringer.sh b/scripts/core/date_stringer.sh deleted file mode 100644 index f0232979..00000000 --- a/scripts/core/date_stringer.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# a handy little method that can be used for date strings. it was getting -# really tiresome how many different ways the script did the date formatting. - -function date_stringer() -{ - date +"%Y_%m_%d_%a_%H%M_%S" | tr -d '/\n/' -} - diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 55a77d19..a8f570a0 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -6,6 +6,10 @@ if [ ! -z "$SHELL_DEBUG" ]; then echo function definitions begin... fi +# a handy little method that can be used for date strings. it was getting +# really tiresome how many different ways the script did the date formatting. +function date_stringer() { date +"%Y_%m_%e_%H%M_%S" | tr -d '/\n/' } + # makes a directory of the name specified and then tries to change the # current directory to that directory. function mcd { diff --git a/scripts/core/get_parent_dir.sh b/scripts/core/get_parent_dir.sh deleted file mode 100644 index 03a507dd..00000000 --- a/scripts/core/get_parent_dir.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -#not perfect--if the thing has not path in front at all, not even a '.', -#then the code below fails since it can't cd into that portion. - -absolute_path=$(cd ${0%/*} && echo $PWD/${0##*/}) - -path_only=$(dirname "$absolute_path") - -echo absolute path to item: $absolute_path -echo just the directory: $path_only diff --git a/scripts/legacy/template.pl b/scripts/examples/legacy/template.pl similarity index 100% rename from scripts/legacy/template.pl rename to scripts/examples/legacy/template.pl diff --git a/scripts/tty/keep_awake_process.sh b/scripts/tty/keep_awake_process.sh index 9303fcb5..855423e5 100644 --- a/scripts/tty/keep_awake_process.sh +++ b/scripts/tty/keep_awake_process.sh @@ -4,7 +4,7 @@ source $FEISTY_MEOW_SCRIPTS/core/date_stringer.sh -# save the process id for the bye bye program to deal with. +# save the process id for the goodbye program to deal with. #echo $$ >>$TMP/trash.last_keep_awake_process #don't let the shutdown guy know who we are; we want to keep running now. diff --git a/scripts/core/byejob.sh b/scripts/users/byejob.sh similarity index 95% rename from scripts/core/byejob.sh rename to scripts/users/byejob.sh index 7d3d44d2..05725447 100644 --- a/scripts/core/byejob.sh +++ b/scripts/users/byejob.sh @@ -36,7 +36,7 @@ for i in $hostlist; do if [ "$host" = "$i" -o "$host" = "$i.$DOMAIN_NAME" ]; then # echo $(date_stringer)": $host matched." >>$HOME/host_matched_in_byejob.txt ( /bin/bash </dev/null 2>&1 +nohup bash $FEISTY_MEOW_SCRIPTS/users/byejob.sh >/dev/null 2>&1 if [ -f $TMP/trash.last_keep_awake_process ]; then kill -9 $(cat $TMP/trash.last_keep_awake_process) diff --git a/scripts/web/javascript/dtree/dtree.css b/webby/javascript/dtree/dtree.css similarity index 100% rename from scripts/web/javascript/dtree/dtree.css rename to webby/javascript/dtree/dtree.css diff --git a/scripts/web/javascript/dtree/dtree.js b/webby/javascript/dtree/dtree.js similarity index 100% rename from scripts/web/javascript/dtree/dtree.js rename to webby/javascript/dtree/dtree.js diff --git a/scripts/web/javascript/gruntose/gruntomote.js b/webby/javascript/gruntose/gruntomote.js similarity index 100% rename from scripts/web/javascript/gruntose/gruntomote.js rename to webby/javascript/gruntose/gruntomote.js diff --git a/scripts/web/javascript/gruntose/launchers.js b/webby/javascript/gruntose/launchers.js similarity index 100% rename from scripts/web/javascript/gruntose/launchers.js rename to webby/javascript/gruntose/launchers.js diff --git a/scripts/web/javascript/gruntose/norse_date.js b/webby/javascript/gruntose/norse_date.js similarity index 100% rename from scripts/web/javascript/gruntose/norse_date.js rename to webby/javascript/gruntose/norse_date.js diff --git a/scripts/web/javascript/gruntose/show_file.js b/webby/javascript/gruntose/show_file.js similarity index 100% rename from scripts/web/javascript/gruntose/show_file.js rename to webby/javascript/gruntose/show_file.js diff --git a/scripts/web/javascript/jquery/jquery-1.5.1.js b/webby/javascript/jquery/jquery-1.5.1.js similarity index 100% rename from scripts/web/javascript/jquery/jquery-1.5.1.js rename to webby/javascript/jquery/jquery-1.5.1.js -- 2.34.1