diff --git a/.npmignore b/.npmignore new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json index 5280264dd..ef439049d 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "authelia", "version": "3.0.0", "description": "2FA Single Sign-On server for nginx using LDAP, TOTP and U2F", - "main": "src/index.js", + "main": "dist/src/server/index.js", "bin": { - "authelia": "src/index.js" + "authelia": "dist/src/server/index.js" }, "scripts": { "test": "./node_modules/.bin/mocha --compilers ts:ts-node/register --recursive test/client test/server", diff --git a/scripts/npm-deployment-test.sh b/scripts/npm-deployment-test.sh index 868fb2b45..92dad4a86 100755 --- a/scripts/npm-deployment-test.sh +++ b/scripts/npm-deployment-test.sh @@ -1,33 +1,37 @@ #!/bin/bash -NPM_UNPACK_DIR=/tmp/npm-unpack/test +NPM_UNPACK_DIR=/tmp/npm-unpack -echo "Packing npm package into a tarball" +echo "--- Packing npm package into a tarball" npm pack AUTHELIA_PACKAGE=`ls | grep "authelia-\([0-9]\+.\)\{2\}[0-9]\+.tgz"` -echo "Authelia package is ${AUTHELIA_PACKAGE}" +echo "--- Authelia package is ${AUTHELIA_PACKAGE}" -echo "Copy package into "${NPM_UNPACK_DIR}" to test unpacking" +echo "--- Copy package into "${NPM_UNPACK_DIR}" to test unpacking" mkdir -p ${NPM_UNPACK_DIR} cp ${AUTHELIA_PACKAGE} ${NPM_UNPACK_DIR} pushd ${NPM_UNPACK_DIR} -echo "Test unpacking..." +echo "--- Test unpacking..." npm install ${AUTHELIA_PACKAGE} -RET_CODE=$? +RET_CODE_INSTALL=$? # echo ${RET_CODE} +# The binary must start and display the help menu +./node_modules/.bin/authelia | grep "No config file has been provided." +RET_CODE_RUN=$? + popd -if [ "$RET_CODE" != "0" ] +if [ "$RET_CODE_INSTALL" != "0" ] || [ "$RET_CODE_RUN" != "0" ] then - echo "Unpacking failed..." + echo "--- Unpacking failed..." exit 1 else - echo "Unpacking succeeded" + echo "+++ Unpacking succeeded" exit 0 fi