X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fprep_feisty_host.sh;h=79253af2c51c6ea3ee1d37e8aa02da596af86b7a;hb=743bee51acc548338cd1c242caff589c8bd058e2;hp=07b95ae06c0fdf2fe2ee4a40a6d231fc63924a36;hpb=3974d01da6ece6956c0bff67e800d1a02d9faa80;p=feisty_meow.git

diff --git a/scripts/core/prep_feisty_host.sh b/scripts/core/prep_feisty_host.sh
index 07b95ae0..79253af2 100644
--- a/scripts/core/prep_feisty_host.sh
+++ b/scripts/core/prep_feisty_host.sh
@@ -21,6 +21,23 @@ function exit_on_error() {
 
 ####
 
+function apt_cyg_finder()
+{
+  if whichable apt-cyg; then
+    return 0  # success.
+#hmmm: is that the right syntax for bash?
+  else
+    echo "
+The apt-cyg tool does not seem to be available for cygwin.
+Please follow the install instructions at:
+    https://github.com/transcode-open/apt-cyg
+"
+    return 13  # not found.
+  fi
+}
+
+####
+
 # load feisty meow environment here, but first test that we *can* load it.
 
 #hmmm: currently, this script needs the system to have already been configured?
@@ -51,39 +68,30 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 ####
 
+#hmmm: why two phases?
+
 # first the crucial bits for scripts to work...
 
 PHASE_MESSAGE="installing perl file and diff modules"
 
-# ubuntu or debian or other apt-based OSes...
 if whichable apt; then
+  # ubuntu or debian or other apt-based OSes...
   sudo apt install libfile-which-perl libtext-diff-perl
   exit_on_error $PHASE_MESSAGE
-# rpm based with yum available...
 elif whichable yum; then  
+  # rpm based with yum available...
   sudo yum install perl-File-Which perl-Text-Diff
   exit_on_error $PHASE_MESSAGE
-# macos based...
 elif [ ! -z "$IS_DARWIN" ]; then
-
-#hmmm: not quite right yet...
-  brew install blah blah? lots?
+  # macos based...
+  brew install dos2unix openssl
   exit_on_error $PHASE_MESSAGE
-
-# windows-based with cygwin (or we'll fail out).
 elif [ "$OS" == "Windows_NT" ]; then
- 
-#hmmm: install apt-cyg!
-# we need this to do the following step, so why not automate that?
-# can we at least check for the packages we absolutely need?
-
-#hmmm: can we bootstrap and still survive on the basic cygwin modules if already installed?
-#  then we could use our huge list to get the rest!
-
-#hmmm: is there any other way to get the missing ones, that we need for apt-cyg?
-
-  apt-cyg install perl-File-Which perl-Text-Diff
-  exit_on_error $PHASE_MESSAGE
+  # windows-based with cygwin (or we'll fail out currently).
+  if apt_cyg_finder; then
+    apt-cyg install perl-File-Which perl-Text-Diff
+    exit_on_error $PHASE_MESSAGE
+  fi
 fi
 
 ####
@@ -92,27 +100,33 @@ fi
 
 PHASE_MESSAGE="installing code builder packages"
 
-# ubuntu or debian or other apt-based OSes...
 if whichable apt; then
-  sudo apt install build-essential librtmp-dev libcurl4-gnutls-dev libssl-dev
+  # ubuntu or debian or other apt-based OSes...
+  sudo apt install mawk build-essential librtmp-dev libcurl4-gnutls-dev libssl-dev
   exit_on_error $PHASE_MESSAGE
-# rpm based with yum available...
 elif whichable yum; then  
-  sudo yum install gcc gcc-c++ openssl-devel.x86_64 curl-devel
+  # rpm based with yum available...
+  sudo yum install mawk gcc gcc-c++ openssl-devel.x86_64 curl-devel
   exit_on_error $PHASE_MESSAGE
-# macos based...
 elif [ ! -z "$IS_DARWIN" ]; then
-
-#hmmm: not quite right yet...
-  brew install blork blork? lots?
+  # macos based...
+#hmmm: still working on these...
+  brew install mawk gpg meld openjdk 
   exit_on_error $PHASE_MESSAGE
-
-# windows-based with cygwin (or we'll fail out).
 elif [ "$OS" == "Windows_NT" ]; then
- 
-#hmmm: unknown list needed still...
-  apt-cyg install fugazi combustinatorinibasil scampnific
-  exit_on_error $PHASE_MESSAGE
+  # windows-based with cygwin (or we'll fail out).
+
+  if apt_cyg_finder; then
+echo need to fix apt cyg install list somewhat.
+#hmmm: list is in our docs as a separate file for cygwin.
+#      plug those packages into here please.
+    apt-cyg install gawk libcurl-devel mingw64-i686-openssl openssl openssl-devel libssl-devel zlib-devel
+    exit_on_error $PHASE_MESSAGE
+
+#extended set.  just add them?
+# xorg-server xorg-docs xlaunch 
+
+  fi
 fi
 
 ####