Skip to content

Commit

Permalink
fixiing unix installer to use daedalus-installer from default.nix
Browse files Browse the repository at this point in the history
  • Loading branch information
disassembler committed Dec 6, 2018
1 parent 78cfe16 commit a44898f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/build-installer-unix.sh
Expand Up @@ -99,7 +99,7 @@ export daedalus_version="${1:-dev}"
mkdir -p ~/.local/bin

if test -e "dist" -o -e "release" -o -e "node_modules"
then sudo rm -rf dist release node_modules || true
then rm -rf dist release node_modules || true
fi

export PATH=$HOME/.local/bin:$PATH
Expand All @@ -118,9 +118,9 @@ DAEDALUS_BRIDGE=$(nix-build --no-out-link -A daedalus-bridge)

pushd installers
echo '~~~ Prebuilding dependencies for cardano-installer, quietly..'
$nix_shell default.nix --run true || echo "Prebuild failed!"
$nix_shell ../default.nix -A daedalus-installer --run true || echo "Prebuild failed!"
echo '~~~ Building the cardano installer generator..'
INSTALLER=$(nix-build -j 2 --no-out-link)
INSTALLER=$(nix-build -j 2 --no-out-link ../ -A daedalus-installer)

for cluster in ${CLUSTERS}
do
Expand All @@ -134,7 +134,7 @@ pushd installers
INSTALLER_CMD+=" --build-job ${build_id}"
INSTALLER_CMD+=" --cluster ${cluster}"
INSTALLER_CMD+=" --out-dir ${APP_NAME}"
$nix_shell ../shell.nix --run "${INSTALLER_CMD}"
nix-shell -p bash --run "${INSTALLER_CMD}"

if [ -d ${APP_NAME} ]; then
if [ -n "${BUILDKITE_JOB_ID:-}" ]
Expand Down

0 comments on commit a44898f

Please sign in to comment.