From 84a10f3297b481ab60f4cd4155244649b21cae06 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 20 Nov 2017 20:31:58 -0500 Subject: [PATCH] added apt-cyg perl info, better recustomize --- readme.txt | 5 ++++- scripts/core/functions.sh | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/readme.txt b/readme.txt index ca3b7459..aaa8283b 100644 --- a/readme.txt +++ b/readme.txt @@ -58,12 +58,15 @@ A couple of perl modules are required by some of the scripts (including the differ utility and the feisty meow customization system). They can be installed with either apt-get or CPAN. -Install using apt-get: +Install using apt-get (on Ubuntu or Debian-based OS): # sudo apt-get install libfile-which-perl libtext-diff-perl or Install using perl's CPAN: # sudo cpan install Text::Diff File::Which +or on Cygwin (MS-Windows), install with apt-cyg: +# apt-cyg install perl-File-Which perl-Text-Diff + ============== How to install the build dependencies for feisty meow diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index daaabcb1..189dac01 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -488,9 +488,12 @@ if [ -z "$skip_all" ]; then pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom")" - local fail_message="\nare the perl dependencies installed? if you're on ubuntu or debian, try this:\n - $(grep "apt.*perl" $FEISTY_MEOW_APEX/readme.txt)\n" - + local fail_message="\n +are the perl dependencies installed? if you're on ubuntu or debian, try this:\n + $(grep "apt-get.*perl" $FEISTY_MEOW_APEX/readme.txt)\n +or if you're on cygwin, then try this (if apt-cyg is available):\n + $(grep "apt-cyg.*perl" $FEISTY_MEOW_APEX/readme.txt)\n"; + #echo "the incongruous files list is: $incongruous_files" # disallow a single character result, since we get "*" as result when nothing exists yet. if [ ${#incongruous_files} -ge 2 ]; then -- 2.34.1