From bd961d26f477647b555215236819c6a1fb72c1d9 Mon Sep 17 00:00:00 2001
From: "amit.heda" <amit.heda@vshsolutions.com>
Date: Tue, 25 May 2021 16:50:59 +0530
Subject: [PATCH] fixed mac os issues

---
 bin/aws-code-deploy.sh | 25 +++++++++++++++++++++++--
 package.json           |  8 ++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/bin/aws-code-deploy.sh b/bin/aws-code-deploy.sh
index 7014e2a..a56cc3c 100644
--- a/bin/aws-code-deploy.sh
+++ b/bin/aws-code-deploy.sh
@@ -97,6 +97,12 @@ installAwsCli() {
   runCommand "sudo pip install awscli"
 }
 
+installCoreUtils() {
+    h2 "Installing CoreUtils"
+    runCommand "HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install coreutils"
+    success "Installing CoreUtils succeeded"
+}
+
 vercomp() {
   if [[ $1 == $2 ]]
   then
@@ -170,6 +176,7 @@ fi
 # Check AWS is installed
 h1 "Step 1: Checking Dependencies"
 
+
 if ! typeExists "aws"; then
   installAwsCli
   success "Installing AWS CLI $(aws --version 2>&1) succeeded"
@@ -184,10 +191,17 @@ else
   fi
 
   success "Dependencies met $(aws --version 2>&1)"
+fi  
+if [[ "$OSTYPE" == "darwin"* ]]; then
+   if ! typeExists "greadlink"; then
+      installCoreUtils
+      success "Installing CoreUtils  succeeded" 
+    fi
 fi
 
 
 
+
 # ----- Configure -----
 # see documentation
 #    http://docs.aws.amazon.com/cli/latest/reference/configure/index.html
@@ -330,7 +344,13 @@ fi
 # ----- Application Source -----
 h1 "Step 6: Checking Application Source"
 AWS_CODE_DEPLOY_APP_BUNDLE_TYPE=${AWS_CODE_DEPLOY_APP_BUNDLE_TYPE:-zip}
-APP_SOURCE=$(readlink -f "${AWS_CODE_DEPLOY_APP_SOURCE:-.}")
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    APP_SOURCE=$(readlink -f "${AWS_CODE_DEPLOY_APP_SOURCE:-.}")    
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    APP_SOURCE=$(greadlink -f "${AWS_CODE_DEPLOY_APP_SOURCE:-.}")
+else
+   APP_SOURCE=$(realpath -f "${AWS_CODE_DEPLOY_APP_SOURCE:-.}")
+fi
 
 if [ ! -d "$APP_SOURCE" -a ! -e "$APP_SOURCE" ]; then
   # Note: Use original variable for output as the readlink can potentially evaluate to ""
@@ -457,7 +477,8 @@ else
         success "Successfuly removed $(($S3_TOTAL_FILES-$S3_DEPLOY_LIMIT)) file(s)"
         break
       fi
-      FILE_LINE=$(expr "$line" : '^.*[0-9]\{2\}\:[0-9]\{2\}\:[0-9]\{2\}[ ]\+[0-9]\+[ ]\+\(.*\)$')
+      #FILE_LINE=$(expr "$line" : '^.*[0-9]\{2\}\:[0-9]\{2\}\:[0-9]\{2\}[ ]\+[0-9]\+[ ]\+\(.*\)$')
+      FILE_LINE=`(echo $line | awk '{$1=$2=$3=""; print $0}' | sed 's/^[ \t]*//')`
       runCommand "aws s3 rm \"s3://$S3_FULL_BUCKET/$FILE_LINE\""
       ((S3_NUMBER_FILES_TO_CLEAN--))
     done
diff --git a/package.json b/package.json
index 46955a7..06f19a9 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "aws-code-deploy",
-  "version": "1.0.11",
+  "name": "@vshsolutions/aws-code-deploy",
+  "version": "1.0.13",
   "description": "Bash script to easily deploy applications with AWS Code Deploy.",
   "author": "TechPivot",
   "main": "bin/aws-code-deploy.sh",
-  "bin": { 
+  "bin": {
     "aws-code-deploy": "./bin/aws-code-deploy.sh"
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/techpivot/aws-code-deploy.git"
+    "url": "git+ssh://git@github.com:vshsolutions/aws-code-deploy.git"
   },
   "license": "MIT",
   "keywords": [