Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Remove new hidden file and fix for .env files for Snap #15120

Merged
merged 2 commits into from
Aug 8, 2019
Merged

[FIX] Remove new hidden file and fix for .env files for Snap #15120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c9b24
rm new hidden file and fix for .env files
LuluGO Aug 6, 2019
7971f79
Merge branch 'develop' into snap-fixes
sampaiodiego Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .snapcraft/resources/prepareRocketChat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

12 changes: 7 additions & 5 deletions .snapcraft/resources/startRocketChat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down