Download as
Browse Code »

Commit 785fb8cb9193ae87b984f2d2f8dd2ffdd45dcb66

Authored by Perry Werneck
1 parent 508586e4
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing custom cert installation on windows packages.

Showing 1 changed file with 11 additions and 10 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @785fb8c
... ... @@ -420,12 +420,6 @@ makeInstaller()
420 420  
421 421 NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
422 422  
423   - mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
424   - cp -rv ${CERTS_DIR}/* ${WORKDIR}/build/${ARCH}/sslcerts
425   - if [ "$?" != "0" ]; then
426   - failed "Can't copy certs"
427   - fi
428   -
429 423 fi
430 424  
431 425 if [ ! -z "${PACKAGE_PLUGINS}" ]; then
... ... @@ -447,6 +441,16 @@ makeInstaller()
447 441 echo -e "\e]2;Creating installers for ${ARCH}\a"
448 442 echo "Creating installers for ${ARCH}"
449 443  
  444 + if [ -d ${CERTS_DIR} ]; then
  445 +
  446 + mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
  447 + cp -rv ${CERTS_DIR}/* ${WORKDIR}/build/${ARCH}/sslcerts
  448 + if [ "$?" != "0" ]; then
  449 + failed "Can't copy certs"
  450 + fi
  451 +
  452 + fi
  453 +
450 454 cd ${WORKDIR}/build/${ARCH}
451 455  
452 456 TARCH=${ARCH}
... ... @@ -459,12 +463,9 @@ makeInstaller()
459 463 makensis ${NSIS_ARGS} ${NSI}
460 464 if [ "$?" != "0" ]; then
461 465 echo makensis ${NSIS_ARGS} ${NSI}
462   - failed "Error building ${NSI}"
  466 + failed "Error building ${ARCH} ${NSI}"
463 467 fi
464 468  
465   - echo "TARCH="[${TARCH}]" ARCH=[${ARCH}]"
466   - ls -l *-[0-9]*-${TARCH}.exe
467   -
468 469 if [ -d ~/public_html ]; then
469 470 mkdir -p ~/public_html/win/${PRODUCT_NAME}/${ARCH}
470 471 cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${PRODUCT_NAME}/${ARCH}
... ...