From 45c9b241325d97aa67ab180391d6177223cafb5d Mon Sep 17 00:00:00 2001 From: "lucia.guevgeozian" Date: Tue, 6 Aug 2019 17:12:24 -0500 Subject: [PATCH] rm new hidden file and fix for .env files --- .snapcraft/resources/prepareRocketChat | 2 ++ .snapcraft/resources/startRocketChat | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index ac352ebda9f7..0f54d5842f9c 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -28,3 +28,5 @@ execstack --clear-execstack npm/node_modules/sharp/vendor/lib/librsvg-2.so* # Having to manually remove because of latest warning rm -rf npm/node_modules/meteor/konecty_user-presence/node_modules/colors/lib/.colors.js.swp +rm -rf node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + diff --git a/.snapcraft/resources/startRocketChat b/.snapcraft/resources/startRocketChat index b39e22742a73..35898d0e3152 100755 --- a/.snapcraft/resources/startRocketChat +++ b/.snapcraft/resources/startRocketChat @@ -25,11 +25,13 @@ function start_rocketchat { export OVERWRITE_SETTING_Site_Url=$siteurl fi - for filename in $SNAP_COMMON/*.env; do - while read env_var; do - export "$env_var" - done < $filename - done + if ls $SNAP_COMMON/*.env >/dev/null 2>&1; then + for filename in $SNAP_COMMON/*.env; do + while read env_var; do + export "$env_var" + done < $filename + done + fi node $SNAP/main.js }