projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
[feisty_meow.git]
/
scripts
/
core
/
functions.sh
diff --git
a/scripts/core/functions.sh
b/scripts/core/functions.sh
index 189dac016546307e7e665e05f816285e4389cbf9..dc01d786208a4b7e952e5252254fa4c1d2438cf2 100644
(file)
--- a/
scripts/core/functions.sh
+++ b/
scripts/core/functions.sh
@@
-144,7
+144,7
@@
if [ -z "$skip_all" ]; then
function test_or_die()
{
if [ $? -ne 0 ]; then
function test_or_die()
{
if [ $? -ne 0 ]; then
- echo -e "\n\naction failed: $*\n\nExiting script..."
+ echo -e "\n\naction failed: $*\n\n
***
Exiting script..."
error_sound
exit 1
fi
error_sound
exit 1
fi
@@
-154,7
+154,7
@@
if [ -z "$skip_all" ]; then
function test_or_continue()
{
if [ $? -ne 0 ]; then
function test_or_continue()
{
if [ $? -ne 0 ]; then
- echo -e "\n\nerror occurred: $*\n\nContinuing script..."
+ echo -e "\n\nerror occurred: $*\n\n
=>
Continuing script..."
error_sound
fi
}
error_sound
fi
}
@@
-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"
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
#hmmm: could save output to show if an error occurs.
fi
echo