qfpm 1.0.20 → 1.0.21

package/bin/postinstall.js

@@ -14,13 +14,20 @@ if(!qfpmAlreadyExists){
 }
 console.log('[!] starting script copy!')
 let scriptNames = []
+let scripts = []
 fs.readdirSync('./src').forEach(script => {
     fs.copyFileSync('./src/'+script,path.resolve(qfPath,script))
     scriptNames.push(script)
+    scripts.push({
+        name: script
+        ,path: path.resolve(qfPath,script)
+        ,run: script.slice(0,script.lastIndexOf('.'))
+        ,ext: script.slice(script.lastIndexOf('.')+1)
+    })
 })
 console.log('[!] finished script copy!')
 console.log('[!] starting old script removal!')
-fs.readdirSync(qfPath).forEach((script) => {
+fs.readdirSync(qfPath).forEach(script => {
     if(scriptNames.indexOf(script)==-1){
         fs.unlinkSync(path.resolve(qfPath,script))
     }
@@ -43,8 +50,12 @@ let pack = JSON.parse(packJSON)
 if(!pack.scripts){
     pack.scripts = {}
 }
-scriptNames.forEach(script => {
-    pack.scripts[script] = 'bash ./bin/qfpm/'+script
+let extensionMap = {
+    sh: 'bash'
+    ,js: 'node'
+}
+scripts.forEach(script => {
+    pack.scripts[script.run] = extensionMap[script.ext]+' ./bin/qfpm/'+script.name
 })
 fs.writeFileSync(path.resolve(installPath,'package.json'),JSON.stringify(pack,null,4))
 console.log('[!] finished package.json update!')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qfpm",
-    "version": "1.0.20",
+    "version": "1.0.21",
     "description": "installs the NPM SFDX Package Dependancy Resolution Proof of Concept scripts",
     "main": "index.js",
     "keywords": [
@@ -10,7 +10,7 @@
         "sfdx"
     ],
     "scripts": {
-        "preinstall": "bash ./bin/preinstall",
+        "preinstall": "bash ./bin/preinstall.sh",
         "postinstall": "node ./bin/postinstall.js"
     },
     "author": "Angus Alves",
@@ -23,4 +23,4 @@
         "url": "https://github.com/gussamer/qfpm/issues"
     },
     "homepage": "https://github.com/gussamer/qfpm#readme"
-}
+}

package/src/{build → build.sh}

@@ -2,8 +2,8 @@
 echo "build PWD: $PWD"
 DXPM_CURRENT_PACKAGE_NAME="$1"
 if [ "$DXPM_CURRENT_PACKAGE_NAME" = "" ]; then
-  DXPM_CURRENT_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+  DXPM_CURRENT_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 fi
 echo "[+] converting source for $DXPM_CURRENT_PACKAGE_NAME"
-sfdx force:source:convert -d "./manifest" -n "$DXPM_CURRENT_PACKAGE_NAME" -p "$($PWD/bin/qfpm/getsrcfolders)" && wait
+sfdx force:source:convert -d "./manifest" -n "$DXPM_CURRENT_PACKAGE_NAME" -p "$(node $PWD/bin/qfpm/getsrcfolders.js)" && wait
 echo "[+] finished converting source for $DXPM_CURRENT_PACKAGE_NAME"

package/src/{clean → clean.sh}

@@ -2,8 +2,8 @@
 echo "clean PWD: $PWD"
 DXPM_SETUP_PACKAGE_NAME="$1"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
-  DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+  DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 fi
 echo "[+] checking if $DXPM_SETUP_PACKAGE_NAME scrach org exists and deleting it"
-$PWD/bin/qfpm/isscratched && sfdx force:org:delete -u "$DXPM_SETUP_PACKAGE_NAME" -p && wait
+node $PWD/bin/qfpm/isscratched.js && sfdx force:org:delete -u "$DXPM_SETUP_PACKAGE_NAME" -p && wait
 echo "[+] finished cleaning $DXPM_SETUP_PACKAGE_NAME scrach org"

package/src/{deploy → deploy.sh}

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 DXPM_SETUP_PACKAGE_NAME="$1"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
-  DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+  DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 fi
 DXPM_CURRENT_PACKAGE_NAME="$2"
 if [ "$DXPM_CURRENT_PACKAGE_NAME" = "" ]; then
@@ -9,5 +9,5 @@ if [ "$DXPM_CURRENT_PACKAGE_NAME" = "" ]; then
 fi
 echo "[+] deploying $DXPM_CURRENT_PACKAGE_NAME metadata to scratch org $DXPM_SETUP_PACKAGE_NAME"
 #todo: read package.json for all folder locations
-sfdx force:source:deploy -p "$($PWD/bin/qfpm/getsrcfolders)" -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait
+sfdx force:source:deploy -p "$(node $PWD/bin/qfpm/getsrcfolders.js)" -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait
 echo "[+] finished deploying $DXPM_CURRENT_PACKAGE_NAME metadata to scratch org $DXPM_SETUP_PACKAGE_NAME"

package/src/{postinstall → postinstall.sh}

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 echo "[!] postinstall PWD: $PWD"
 echo "[!] postinstall INIT_CWD: $INIT_CWD"
-DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname $INIT_CWD)"
-DXPM_CURRENT_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js $INIT_CWD)"
+DXPM_CURRENT_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 echo "[!] postinstall DXPM_SETUP_PACKAGE_NAME: $DXPM_SETUP_PACKAGE_NAME"
 echo "[!] postinstall DXPM_CURRENT_PACKAGE_NAME: $DXPM_CURRENT_PACKAGE_NAME"
 echo "[+] check if $DXPM_CURRENT_PACKAGE_NAME is the setup package $DXPM_SETUP_PACKAGE_NAME or a dependancy of $DXPM_SETUP_PACKAGE_NAME"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "$DXPM_CURRENT_PACKAGE_NAME" ]; then
   echo "[+] setting up for $DXPM_CURRENT_PACKAGE_NAME development and testing"
-  $PWD/bin/qfpm/isscratched && bash ./bin/qfpm/push $DXPM_CURRENT_PACKAGE_NAME && wait
+  node $PWD/bin/qfpm/isscratched.js && bash $PWD/bin/qfpm/push.sh $DXPM_CURRENT_PACKAGE_NAME && wait
   echo "[+] finished setting up for $DXPM_CURRENT_PACKAGE_NAME development and testing"
 else
   echo "[+] installing dependancy $DXPM_CURRENT_PACKAGE_NAME of $DXPM_SETUP_PACKAGE_NAME"
-  $PWD/bin/qfpm/isscratched $DXPM_SETUP_PACKAGE_NAME && bash ./bin/qfpm/deploy $DXPM_SETUP_PACKAGE_NAME $DXPM_CURRENT_PACKAGE_NAME && wait
+  node $PWD/bin/qfpm/isscratched.js $DXPM_SETUP_PACKAGE_NAME && bash $PWD/bin/qfpm/deploy.sh $DXPM_SETUP_PACKAGE_NAME $DXPM_CURRENT_PACKAGE_NAME && wait
   echo "[+] finished installing dependancy $DXPM_CURRENT_PACKAGE_NAME of $DXPM_SETUP_PACKAGE_NAME"
 fi

package/src/{preinstall → preinstall.sh}

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 echo "[!] preinstall PWD: $PWD"
 echo "[!] preinstall INIT_CWD: $INIT_CWD"
-DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname $INIT_CWD)"
-DXPM_CURRENT_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js $INIT_CWD)"
+DXPM_CURRENT_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 echo "[!] preinstall DXPM_SETUP_PACKAGE_NAME: $DXPM_SETUP_PACKAGE_NAME"
 echo "[!] preinstall DXPM_CURRENT_PACKAGE_NAME: $DXPM_CURRENT_PACKAGE_NAME"
 echo "[+] begin install of $DXPM_CURRENT_PACKAGE_NAME"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "$DXPM_CURRENT_PACKAGE_NAME" ]; then
   echo "[+] removing dependancies for $DXPM_CURRENT_PACKAGE_NAME to force reinstall"
-  $PWD/bin/qfpm/removedepends
+  bash $PWD/bin/qfpm/removedepends.sh
   echo "[+] finished removing dependancies for $DXPM_CURRENT_PACKAGE_NAME"
 fi

package/src/{push → push.sh}

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 DXPM_SETUP_PACKAGE_NAME="$1"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
-  DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+  DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 fi
 echo "[+] pushing source to scratch org $DXPM_SETUP_PACKAGE_NAME"
 sfdx force:source:push -f -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait

package/src/{scratch → scratch.sh}

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 DXPM_SETUP_PACKAGE_NAME="$1"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
-  DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+  DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 fi
 echo "[+] setting up scratch org $DXPM_SETUP_PACKAGE_NAME"
 sfdx force:org:create -f $PWD/config/project-scratch-def.json -a "$DXPM_SETUP_PACKAGE_NAME" -d 1 -w 5 && wait

package/src/{setup → setup.sh}

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-export DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+export DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 export DXPM_CURRENT_PACKAGE_NAME="$DXPM_SETUP_PACKAGE_NAME"
 echo "[+] checking if $DXPM_SETUP_PACKAGE_NAME scrach org exists or creating it"
-$PWD/bin/qfpm/isscratched || $PWD/bin/qfpm/scratch && wait
+node $PWD/bin/qfpm/isscratched.js || bash $PWD/bin/qfpm/scratch.sh && wait
 echo "[+] installing package $DXPM_SETUP_PACKAGE_NAME"
 npm install --only=prod && wait
 echo "[+] finished installing package $DXPM_SETUP_PACKAGE_NAME"

package/src/{test → test.sh}

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 DXPM_SETUP_PACKAGE_NAME="$1"
 if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
-  DXPM_SETUP_PACKAGE_NAME="$($PWD/bin/qfpm/getprojectname)"
+  DXPM_SETUP_PACKAGE_NAME="$(node $PWD/bin/qfpm/getprojectname.js)"
 fi
 echo "[+] running tests for $DXPM_SETUP_PACKAGE_NAME"
 sfdx force:apex:test:run -l RunLocalTests -d ./test_results -r json -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait