Deployment hacking while trying to deploy on rinkeby

This currently breaks the local usage because of the different appIds:
<name>.open.aragonpm.eth vs. <name>.aragonpm.eth (local)

scripts/deploy-apps.sh

@@ -14,7 +14,7 @@ for dir in ./apps/*/; do
   set -x
   cd $dir
   npm install
-  aragon apm publish major
+  aragon apm publish major 
   cd $rootDir
   set +x
 done

scripts/deploy-kit.js

@@ -2,15 +2,37 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 
 const fs = require('fs');
 const path = require('path');
+const argv = require('yargs').argv
+const namehash = require('eth-ens-namehash').hash
+
 const libPath = path.join(__dirname, '..', 'lib');
 const addressesPath = path.join(libPath, 'addresses');
 
+const DAOFactory = artifacts.require('DAOFactory')
 const KreditsKit = artifacts.require('KreditsKit')
 
-const ensAddr = process.env.ENS
-const daoFactoryAddress = process.env.DAO_FACTORY
+const arapp = require('../arapp.json')
+const environment = argv['network'] || argv['environment'] || 'development'
+const apm = arapp.environments[environment].apm
+const ensAddr = arapp.environments[environment].registry || process.env.ENS
+const daoFactoryAddress = arapp.environments[environment].daoFactory || process.env.DAO_FACTORY
+
 
 module.exports = async function(callback) {
+
+  // load networkId; will change with updated truffle
+  const networkPromise = new Promise((resolve, reject) => {
+    web3.version.getNetwork((err, network) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(network);
+      }
+    })
+  })
+  const networkId = await networkPromise;
+  console.log(`Deploying to networkId: ${networkId}`)
+
   if (!ensAddr) {
     callback(new Error("ENS address not found in environment variable ENS"))
   }
@@ -24,16 +46,22 @@ module.exports = async function(callback) {
   }
   console.log(`Using DAOFactory at: ${daoFactory.address}`)
 
-  let kreditsKit = await KreditsKit.new(daoFactory.address, ensAddr)
+  const apps = fs.readdirSync('./apps')
+  console.log(`Found apps: [${apps}].${apm}`)
+  const appIds = apps.map(app => namehash(`kredits-${app}.${apm}`))
 
-  const networkId = parseInt(web3.version.network);
+  KreditsKit.new(daoFactory.address, ensAddr, appIds).then((kreditsKit) => {
+    console.log(`Deployed KreditsKit at: ${kreditsKit.address}`);
 
-  let addresseFile = path.join(addressesPath, `KreditsKit.json`);
-  let addresses = JSON.parse(fs.readFileSync(addresseFile));
+    let addresseFile = path.join(addressesPath, `KreditsKit.json`);
+    let addresses = JSON.parse(fs.readFileSync(addresseFile));
 
-  addresses[networkId] = kreditsKit.address;
-  fs.writeFileSync(addresseFile, JSON.stringify(addresses));
+    addresses[networkId] = kreditsKit.address;
+    fs.writeFileSync(addresseFile, JSON.stringify(addresses));
 
-  console.log(`Deployed KreditsKit at: ${kreditsKit.address}`);
-  callback();
+    callback();
+  }).catch((e) => {
+    console.log(e);
+    callback(e);
+  })
 }

scripts/new-dao.js

@@ -6,7 +6,18 @@ const addressesPath = path.join(libPath, 'addresses');
 const KreditsKit = artifacts.require('KreditsKit')
 
 module.exports = async function(callback) {
-  const networkId = parseInt(web3.version.network);
+  // load networkId; will change with updated truffle
+  const networkPromise = new Promise((resolve, reject) => {
+    web3.version.getNetwork((err, network) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(network);
+      }
+    })
+  })
+  const networkId = await networkPromise;
+  console.log(`Deploying to networkId: ${networkId}`)
 
   let kitAddresseFile = path.join(addressesPath, 'KreditsKit.json');
   let kitAddresses = JSON.parse(fs.readFileSync(kitAddresseFile));