mirror of
https://github.com/Kron4ek/Conty
synced 2024-12-26 09:58:38 +01:00
Preserve environment variables when exporting desktop files
Not all environment variables, but those related to Conty.
This commit is contained in:
parent
14e606729f
commit
a68c21884b
1 changed files with 15 additions and 3 deletions
|
@ -19,7 +19,7 @@ script_version="1.22"
|
||||||
|
|
||||||
# Important variables to manually adjust after modification!
|
# Important variables to manually adjust after modification!
|
||||||
# Needed to avoid problems with mounting due to an incorrect offset.
|
# Needed to avoid problems with mounting due to an incorrect offset.
|
||||||
script_size=26757
|
script_size=27087
|
||||||
utils_size=2507588
|
utils_size=2507588
|
||||||
|
|
||||||
# Full path to the script
|
# Full path to the script
|
||||||
|
@ -794,7 +794,7 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || \
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" = "-d" ]; then
|
if [ "$1" = "-d" ] && [ -z "${script_is_symlink}" ]; then
|
||||||
applications_dir="${HOME}"/.local/share/applications/Conty
|
applications_dir="${HOME}"/.local/share/applications/Conty
|
||||||
|
|
||||||
if [ -d "${applications_dir}" ]; then
|
if [ -d "${applications_dir}" ]; then
|
||||||
|
@ -807,6 +807,18 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || \
|
||||||
mkdir -p "${applications_dir}"
|
mkdir -p "${applications_dir}"
|
||||||
cd "${mount_point}"/usr/share/applications || exit 1
|
cd "${mount_point}"/usr/share/applications || exit 1
|
||||||
|
|
||||||
|
unset variables
|
||||||
|
vars="BASE_DIR DISABLE_NET DISABLE_X11 HOME_DIR SANDBOX SANDBOX_LEVEL USE_SYS_UTILS"
|
||||||
|
for v in ${vars}; do
|
||||||
|
if [ -n "${!v}" ]; then
|
||||||
|
variables="${v}=\"${!v}\" ${variables}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -n "${variables}" ]; then
|
||||||
|
variables="env ${variables} "
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Exporting..."
|
echo "Exporting..."
|
||||||
shift
|
shift
|
||||||
for f in *.desktop */ */*.desktop; do
|
for f in *.desktop */ */*.desktop; do
|
||||||
|
@ -822,7 +834,7 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || \
|
||||||
if [ "${line_function}" = "Name" ]; then
|
if [ "${line_function}" = "Name" ]; then
|
||||||
line="${line} (Conty)"
|
line="${line} (Conty)"
|
||||||
elif [ "${line_function}" = "Exec" ]; then
|
elif [ "${line_function}" = "Exec" ]; then
|
||||||
line="Exec=\"${script}\" $@ $(echo "${line}" | tail -c +6)"
|
line="Exec=${variables}\"${script}\" $@ $(echo "${line}" | tail -c +6)"
|
||||||
elif [ "${line_function}" = "TryE" ]; then
|
elif [ "${line_function}" = "TryE" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue