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

data: fix shellcheck warnings in snapd.sh.in #8520

Merged
merged 4 commits into from Jun 3, 2020
Merged

data: fix shellcheck warnings in snapd.sh.in #8520

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7db04cf
Fixing shellcheck warnings.
jelovac Apr 18, 2020
26b1c82
Merge remote-tracking branch 'upstream/master'
jelovac May 6, 2020
576a302
Merge remote-tracking branch 'upstream/master'
jelovac May 28, 2020
17955fc
Merge remote-tracking branch 'upstream/master'
jelovac May 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/env/snapd.sh.in
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

# Expand $PATH to include the directory where snappy applications go.
snap_bin_path="@SNAP_MOUNT_DIR@/bin"
if [ -n "${PATH##*${snap_bin_path}}" -a -n "${PATH##*${snap_bin_path}:*}" ]; then
if [ -n "${PATH##*${snap_bin_path}}" ] && [ -n "${PATH##*${snap_bin_path}:*}" ]; then
export PATH=$PATH:${snap_bin_path}
fi

Expand All @@ -16,7 +16,7 @@ fi
# looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
# snappy applications' desktop files.
snap_xdg_path="/var/lib/snapd/desktop"
if [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}}" -a -n "${XDG_DATA_DIRS##*${snap_xdg_path}:*}" ]; then
if [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}}" ] && [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}:*}" ]; then
export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${snap_xdg_path}"
fi