FIX: building on windows

Author: Michael O'Brien

.local.mk

@@ -2,7 +2,7 @@
     "name": "ejscript",
     "description": "Embedthis Ejscript Javascript Language",
     "title": "Embedthis Ejscript",
-    "version": "2.7.6",
+    "version": "2.7.7",
     "keywords": [
         "ejs",
         "ejscript",

pak.json

@@ -23,7 +23,7 @@ function clone(src) {
     return result
 }
 
-export default function blend(dest, src, combine = '') {
+export function blend(dest, src, combine = '') {
     if (!src) {
         return dest
     }

paks/assist/blend.js

@@ -28,9 +28,9 @@ function buildParts() {
         if [ -f gulpfile.ts ] ; then
             gulp build $*
         elif [ -f main.me ] ; then
-            me $*
+            me
         elif [ -f Makefile ] ; then
-            make $*
+            make
         fi
         [ $? != 0 ] && exit 2
         cd ..

paks/assist/build-parts

@@ -109,7 +109,7 @@ getHost() {
 checkTargets() {
     local arn targets tcount
     allTargets=$(aws ec2 describe-instances \
-        --filter "Name=tag:aws:autoscaling:groupName,Values=[${AWS_PROXY}]" --output text \
+        --filter "Name=tag:aws:autoscaling:groupName,Values=${AWS_PROXY}" --output text \
         --query 'Reservations[].Instances[].InstanceId')
     if [ $? != 0 ] ; then
         echo "Cannot describe instances"

paks/assist/docker-deploy-elb

@@ -28,7 +28,7 @@ getTargets() {
     local arn targets tcount tag value
     tag="${DEPLOY_TAG/=*}"
     value="${DEPLOY_TAG/*=}"
-    aws ec2 describe-instances --filter "Name=tag:${tag},Values=[${value}]" \
+    aws ec2 describe-instances --filter "Name=tag:${tag},Values=${value}" \
         --output text --query 'Reservations[].Instances[].InstanceId'
     if [ $? != 0 ] ; then
         echo "Cannot describe instances"

paks/assist/docker-deploy-instance

@@ -11,6 +11,7 @@ else
     VERSION=$(pak --dir .. edit version)
 fi
 
+
 while [[ $# -gt 0 ]] ; do
     arg="$1"
     case ${arg} in

paks/assist/docker-publish

@@ -6,7 +6,7 @@ import * as gulp from 'gulp'
 import * as log from 'fancy-log'
 import clean from './clean'
 import config from 'assist'
-import blend from 'assist/blend'
+import {blend} from 'assist/blend'
 import render from './render'
 import patch from './patch'
 import publish from './publish'

paks/assist/gulp/website/build.js

@@ -7,7 +7,6 @@ global.print = (...args) => console.log(...args)
 let path = process.env.NODE_PATH
 if (!path || path.indexOf('paks') < 0) {
     process.env.NODE_PATH = [ 
-        global.top + '/paks',
         global.top + '/../paks', 
         global.top + '/node_modules'
     ].join(':')

paks/assist/gulp/website/init.js

@@ -6,7 +6,7 @@ import * as fs from 'fs'
 import * as json5 from 'json5'
 import * as gulp from 'gulp'
 import * as log from 'fancy-log'
-import blend from './blend'
+import {blend} from './blend'
 
 /*
     Polyfills