From 313b7d72e4fe605b177a5ded49f49376cffa02a8 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 30 Nov 2012 18:07:40 -0800 Subject: [PATCH] More cleanups Move the fail/success/welcome messages from utils into a set of shared message data files that are randomly selected from as needed. Remove self->self symlinks before doing the symlink operation for those that have configuration being written to the place where it will be symlinking to. --- conf/messages/fails.1.txt | 4 ++++ conf/messages/fails.10.txt | 6 ++++++ conf/messages/fails.11.txt | 8 ++++++++ conf/messages/fails.12.txt | 6 ++++++ conf/messages/fails.13.txt | 6 ++++++ conf/messages/fails.14.txt | 5 +++++ conf/messages/fails.15.txt | 5 +++++ conf/messages/fails.16.txt | 5 +++++ conf/messages/fails.17.txt | 4 ++++ conf/messages/fails.18.txt | 6 ++++++ conf/messages/fails.19.txt | 8 ++++++++ conf/messages/fails.2.txt | 4 ++++ conf/messages/fails.20.txt | 4 ++++ conf/messages/fails.21.txt | 6 ++++++ conf/messages/fails.3.txt | 5 +++++ conf/messages/fails.4.txt | 5 +++++ conf/messages/fails.5.txt | 5 +++++ conf/messages/fails.6.txt | 4 ++++ conf/messages/fails.7.txt | 5 +++++ conf/messages/fails.8.txt | 6 ++++++ conf/messages/fails.9.txt | 7 +++++++ conf/messages/stacks.1.txt | 7 +++++++ conf/messages/stacks.2.txt | 6 ++++++ conf/messages/stacks.3.txt | 5 +++++ conf/messages/stacks.4.txt | 6 ++++++ conf/messages/stacks.5.txt | 6 ++++++ conf/messages/stacks.6.txt | 8 ++++++++ conf/messages/success.1.txt | 10 ++++++++++ conf/messages/success.2.txt | 4 ++++ conf/messages/success.3.txt | 7 +++++++ conf/messages/success.4.txt | 6 ++++++ conf/messages/success.5.txt | 5 +++++ conf/messages/success.6.txt | 4 ++++ conf/messages/welcome.1.txt | 1 + conf/messages/welcome.2.txt | 1 + 35 files changed, 190 insertions(+) create mode 100644 conf/messages/fails.1.txt create mode 100644 conf/messages/fails.10.txt create mode 100644 conf/messages/fails.11.txt create mode 100644 conf/messages/fails.12.txt create mode 100644 conf/messages/fails.13.txt create mode 100644 conf/messages/fails.14.txt create mode 100644 conf/messages/fails.15.txt create mode 100644 conf/messages/fails.16.txt create mode 100644 conf/messages/fails.17.txt create mode 100644 conf/messages/fails.18.txt create mode 100644 conf/messages/fails.19.txt create mode 100644 conf/messages/fails.2.txt create mode 100644 conf/messages/fails.20.txt create mode 100644 conf/messages/fails.21.txt create mode 100644 conf/messages/fails.3.txt create mode 100644 conf/messages/fails.4.txt create mode 100644 conf/messages/fails.5.txt create mode 100644 conf/messages/fails.6.txt create mode 100644 conf/messages/fails.7.txt create mode 100644 conf/messages/fails.8.txt create mode 100644 conf/messages/fails.9.txt create mode 100644 conf/messages/stacks.1.txt create mode 100644 conf/messages/stacks.2.txt create mode 100644 conf/messages/stacks.3.txt create mode 100644 conf/messages/stacks.4.txt create mode 100644 conf/messages/stacks.5.txt create mode 100644 conf/messages/stacks.6.txt create mode 100644 conf/messages/success.1.txt create mode 100644 conf/messages/success.2.txt create mode 100644 conf/messages/success.3.txt create mode 100644 conf/messages/success.4.txt create mode 100644 conf/messages/success.5.txt create mode 100644 conf/messages/success.6.txt create mode 100644 conf/messages/welcome.1.txt create mode 100644 conf/messages/welcome.2.txt diff --git a/conf/messages/fails.1.txt b/conf/messages/fails.1.txt new file mode 100644 index 00000000..509cfde1 --- /dev/null +++ b/conf/messages/fails.1.txt @@ -0,0 +1,4 @@ + + __________ +< Failure! > + ---------- diff --git a/conf/messages/fails.10.txt b/conf/messages/fails.10.txt new file mode 100644 index 00000000..b8047f24 --- /dev/null +++ b/conf/messages/fails.10.txt @@ -0,0 +1,6 @@ + + _____________________ +/ We were in the nick \ +| of time. You were | +\ in great peril. / + --------------------- diff --git a/conf/messages/fails.11.txt b/conf/messages/fails.11.txt new file mode 100644 index 00000000..80016e75 --- /dev/null +++ b/conf/messages/fails.11.txt @@ -0,0 +1,8 @@ + + ___________________ +/ I know a dead \ +| parrot when I see | +| one, and I'm | +| looking at one | +\ right now. / + ------------------- diff --git a/conf/messages/fails.12.txt b/conf/messages/fails.12.txt new file mode 100644 index 00000000..b69cdf77 --- /dev/null +++ b/conf/messages/fails.12.txt @@ -0,0 +1,6 @@ + + _________________ +/ Welcome to the \ +| National Cheese | +\ Emporium / + ----------------- diff --git a/conf/messages/fails.13.txt b/conf/messages/fails.13.txt new file mode 100644 index 00000000..339cd208 --- /dev/null +++ b/conf/messages/fails.13.txt @@ -0,0 +1,6 @@ + + ______________________ +/ What is the airspeed \ +| velocity of an | +\ unladen swallow? / + ---------------------- diff --git a/conf/messages/fails.14.txt b/conf/messages/fails.14.txt new file mode 100644 index 00000000..9b151126 --- /dev/null +++ b/conf/messages/fails.14.txt @@ -0,0 +1,5 @@ + + ______________________ +/ Now stand aside, \ +\ worthy adversary. / + ---------------------- diff --git a/conf/messages/fails.15.txt b/conf/messages/fails.15.txt new file mode 100644 index 00000000..35f65931 --- /dev/null +++ b/conf/messages/fails.15.txt @@ -0,0 +1,5 @@ + + ___________________ +/ Okay, we'll call \ +\ it a draw. / + ------------------- diff --git a/conf/messages/fails.16.txt b/conf/messages/fails.16.txt new file mode 100644 index 00000000..32ff05fd --- /dev/null +++ b/conf/messages/fails.16.txt @@ -0,0 +1,5 @@ + + _______________ +/ She turned me \ +\ into a newt! / + --------------- diff --git a/conf/messages/fails.17.txt b/conf/messages/fails.17.txt new file mode 100644 index 00000000..ef55c829 --- /dev/null +++ b/conf/messages/fails.17.txt @@ -0,0 +1,4 @@ + + ___________________ +< Fetchez la vache! > + ------------------- diff --git a/conf/messages/fails.18.txt b/conf/messages/fails.18.txt new file mode 100644 index 00000000..323ecfe7 --- /dev/null +++ b/conf/messages/fails.18.txt @@ -0,0 +1,6 @@ + + __________________________ +/ We'd better not risk \ +| another frontal assault, | +\ that rabbit's dynamite. / + -------------------------- diff --git a/conf/messages/fails.19.txt b/conf/messages/fails.19.txt new file mode 100644 index 00000000..122e0094 --- /dev/null +++ b/conf/messages/fails.19.txt @@ -0,0 +1,8 @@ + + ______________________ +/ This is supposed to \ +| be a happy occasion. | +| Let's not bicker and | +| argue about who | +\ killed who. / + ---------------------- diff --git a/conf/messages/fails.2.txt b/conf/messages/fails.2.txt new file mode 100644 index 00000000..e85ac3a1 --- /dev/null +++ b/conf/messages/fails.2.txt @@ -0,0 +1,4 @@ + + ___________ +< Run away! > + ----------- diff --git a/conf/messages/fails.20.txt b/conf/messages/fails.20.txt new file mode 100644 index 00000000..de24fa34 --- /dev/null +++ b/conf/messages/fails.20.txt @@ -0,0 +1,4 @@ + + _______________________ +< You have been borked. > + ----------------------- diff --git a/conf/messages/fails.21.txt b/conf/messages/fails.21.txt new file mode 100644 index 00000000..2090a414 --- /dev/null +++ b/conf/messages/fails.21.txt @@ -0,0 +1,6 @@ + + __________________ +/ We used to dream \ +| of living in a | +\ corridor! / + ------------------- diff --git a/conf/messages/fails.3.txt b/conf/messages/fails.3.txt new file mode 100644 index 00000000..0852d572 --- /dev/null +++ b/conf/messages/fails.3.txt @@ -0,0 +1,5 @@ + + ______________________ +/ NOBODY expects the \ +\ Spanish Inquisition! / + ---------------------- diff --git a/conf/messages/fails.4.txt b/conf/messages/fails.4.txt new file mode 100644 index 00000000..3c152600 --- /dev/null +++ b/conf/messages/fails.4.txt @@ -0,0 +1,5 @@ + + ______________________ +/ Spam spam spam spam \ +\ baked beans and spam / + ---------------------- diff --git a/conf/messages/fails.5.txt b/conf/messages/fails.5.txt new file mode 100644 index 00000000..e2b4f0d9 --- /dev/null +++ b/conf/messages/fails.5.txt @@ -0,0 +1,5 @@ + + ____________________ +/ Brave Sir Robin \ +\ ran away. / + -------------------- diff --git a/conf/messages/fails.6.txt b/conf/messages/fails.6.txt new file mode 100644 index 00000000..353f3078 --- /dev/null +++ b/conf/messages/fails.6.txt @@ -0,0 +1,4 @@ + + _______________________ +< Message for you, sir. > + ----------------------- diff --git a/conf/messages/fails.7.txt b/conf/messages/fails.7.txt new file mode 100644 index 00000000..f9dabbde --- /dev/null +++ b/conf/messages/fails.7.txt @@ -0,0 +1,5 @@ + + ____________________ +/ We are the knights \ +\ who say.... NI! / + -------------------- diff --git a/conf/messages/fails.8.txt b/conf/messages/fails.8.txt new file mode 100644 index 00000000..937e617f --- /dev/null +++ b/conf/messages/fails.8.txt @@ -0,0 +1,6 @@ + + ____________________ +/ Now go away or I \ +| shall taunt you a | +\ second time. / + -------------------- diff --git a/conf/messages/fails.9.txt b/conf/messages/fails.9.txt new file mode 100644 index 00000000..c054dffa --- /dev/null +++ b/conf/messages/fails.9.txt @@ -0,0 +1,7 @@ + + ____________________ +/ It's time for the \ +| penguin on top of | +| your television to | +\ explode. / + -------------------- diff --git a/conf/messages/stacks.1.txt b/conf/messages/stacks.1.txt new file mode 100644 index 00000000..ea00c325 --- /dev/null +++ b/conf/messages/stacks.1.txt @@ -0,0 +1,7 @@ + + ___ ____ _____ _ _ ____ _____ _ ____ _ __ + / _ \| _ \| ____| \ | / ___|_ _|/ \ / ___| |/ / +| | | | |_) | _| | \| \___ \ | | / _ \| | | ' / +| |_| | __/| |___| |\ |___) || |/ ___ \ |___| . \ + \___/|_| |_____|_| \_|____/ |_/_/ \_\____|_|\_\ + diff --git a/conf/messages/stacks.2.txt b/conf/messages/stacks.2.txt new file mode 100644 index 00000000..6d38093e --- /dev/null +++ b/conf/messages/stacks.2.txt @@ -0,0 +1,6 @@ + + ___ ___ ___ _ _ ___ _____ _ ___ _ __ + / _ \| _ \ __| \| / __|_ _/_\ / __| |/ / +| (_) | _/ _|| .` \__ \ | |/ _ \ (__| ' < + \___/|_| |___|_|\_|___/ |_/_/ \_\___|_|\_\ + diff --git a/conf/messages/stacks.3.txt b/conf/messages/stacks.3.txt new file mode 100644 index 00000000..478240b3 --- /dev/null +++ b/conf/messages/stacks.3.txt @@ -0,0 +1,5 @@ + +____ ___ ____ _ _ ____ ___ ____ ____ _ _ +| | |__] |___ |\ | [__ | |__| | |_/ +|__| | |___ | \| ___] | | | |___ | \_ + diff --git a/conf/messages/stacks.4.txt b/conf/messages/stacks.4.txt new file mode 100644 index 00000000..0f2ddfb9 --- /dev/null +++ b/conf/messages/stacks.4.txt @@ -0,0 +1,6 @@ + + _ ___ ___ _ _ __ ___ _ __ _ _ + / \| o \ __|| \| |/ _||_ _|/ \ / _|| |// +( o ) _/ _| | \\ |\_ \ | || o ( (_ | ( + \_/|_| |___||_|\_||__/ |_||_n_|\__||_|\\ + diff --git a/conf/messages/stacks.5.txt b/conf/messages/stacks.5.txt new file mode 100644 index 00000000..bca585d2 --- /dev/null +++ b/conf/messages/stacks.5.txt @@ -0,0 +1,6 @@ + + _ ___ ___ _ __ ___ _____ _ __ _ + ,' \ / o |/ _/ / |/ /,' _//_ _/.' \ ,'_/ / //7 +/ o |/ _,'/ _/ / || /_\ `. / / / o // /_ / ,' +|_,'/_/ /___//_/|_//___,' /_/ /_n_/ |__//_/\\ + diff --git a/conf/messages/stacks.6.txt b/conf/messages/stacks.6.txt new file mode 100644 index 00000000..9e0f4b0a --- /dev/null +++ b/conf/messages/stacks.6.txt @@ -0,0 +1,8 @@ + + _____ ___ ___ _ _ ___ _____ _____ ___ _ _ +( _ )( _`\ ( _`\ ( ) ( )( _`\(_ _)( _ )( _`\ ( ) ( ) +| ( ) || |_) )| (_(_)| `\| || (_(_) | | | (_) || ( (_)| |/'/' +| | | || ,__/'| _)_ | , ` |`\__ \ | | | _ || | _ | , < +| (_) || | | (_( )| |`\ |( )_) | | | | | | || (_( )| |\`\ +(_____)(_) (____/'(_) (_)`\____) (_) (_) (_)(____/'(_) (_) + diff --git a/conf/messages/success.1.txt b/conf/messages/success.1.txt new file mode 100644 index 00000000..f73d4c97 --- /dev/null +++ b/conf/messages/success.1.txt @@ -0,0 +1,10 @@ + + ___________ +/ You shine \ +| out like | +| a shaft | +| of gold | +| when all | +| around is | +\ dark. / + ----------- diff --git a/conf/messages/success.2.txt b/conf/messages/success.2.txt new file mode 100644 index 00000000..8c59131a --- /dev/null +++ b/conf/messages/success.2.txt @@ -0,0 +1,4 @@ + + ______________________________ +< I'm a lumberjack and I'm OK. > + ------------------------------ diff --git a/conf/messages/success.3.txt b/conf/messages/success.3.txt new file mode 100644 index 00000000..3b724f78 --- /dev/null +++ b/conf/messages/success.3.txt @@ -0,0 +1,7 @@ + + ____________________ +/ Australia! \ +| Australia! | +| Australia! | +\ We love you, amen. / + -------------------- diff --git a/conf/messages/success.4.txt b/conf/messages/success.4.txt new file mode 100644 index 00000000..b34d774f --- /dev/null +++ b/conf/messages/success.4.txt @@ -0,0 +1,6 @@ + + ______________ +/ Say no more, \ +| Nudge nudge | +\ wink wink. / + -------------- diff --git a/conf/messages/success.5.txt b/conf/messages/success.5.txt new file mode 100644 index 00000000..740ccc0a --- /dev/null +++ b/conf/messages/success.5.txt @@ -0,0 +1,5 @@ + + ________________ +/ And there was \ +\ much rejoicing / + ---------------- diff --git a/conf/messages/success.6.txt b/conf/messages/success.6.txt new file mode 100644 index 00000000..db282288 --- /dev/null +++ b/conf/messages/success.6.txt @@ -0,0 +1,4 @@ + + __________ +< Success! > + ---------- \ No newline at end of file diff --git a/conf/messages/welcome.1.txt b/conf/messages/welcome.1.txt new file mode 100644 index 00000000..31252eb3 --- /dev/null +++ b/conf/messages/welcome.1.txt @@ -0,0 +1 @@ +And now for something completely different! \ No newline at end of file diff --git a/conf/messages/welcome.2.txt b/conf/messages/welcome.2.txt new file mode 100644 index 00000000..09d761c8 --- /dev/null +++ b/conf/messages/welcome.2.txt @@ -0,0 +1 @@ +Let us get on with the show! \ No newline at end of file