mirror of
https://github.com/m-housh/dotfiles.git
synced 2026-02-15 14:42:37 +00:00
fix: Fixes webapp install scripts to handle 'null' values in json specs
This commit is contained in:
4
env/.local/scripts/install-webapp
vendored
4
env/.local/scripts/install-webapp
vendored
@@ -121,7 +121,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Use custom exec if provided, otherwise default behavior
|
# Use custom exec if provided, otherwise default behavior
|
||||||
if [[ -n $CUSTOM_EXEC ]]; then
|
if [[ -n $CUSTOM_EXEC ]] && [[ ! $CUSTOM_EXEC == "null" ]]; then
|
||||||
EXEC_COMMAND="$CUSTOM_EXEC"
|
EXEC_COMMAND="$CUSTOM_EXEC"
|
||||||
else
|
else
|
||||||
EXEC_COMMAND="${SCRIPTS:-$HOME/.local/scripts}/launch-webapp $APP_URL"
|
EXEC_COMMAND="${SCRIPTS:-$HOME/.local/scripts}/launch-webapp $APP_URL"
|
||||||
@@ -143,7 +143,7 @@ StartupNotify=true
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Add mime types if provided
|
# Add mime types if provided
|
||||||
if [[ -n $MIME_TYPES ]]; then
|
if [[ -n $MIME_TYPES ]] && [[ ! $MIME_TYPES == "null" ]]; then
|
||||||
echo "MimeType=$MIME_TYPES" >>"$DESKTOP_FILE"
|
echo "MimeType=$MIME_TYPES" >>"$DESKTOP_FILE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
4
webapp
4
webapp
@@ -57,7 +57,7 @@ install() {
|
|||||||
# Install local icons if needed
|
# Install local icons if needed
|
||||||
mkdir -p $XDG_DATA_HOME/applications/icons
|
mkdir -p $XDG_DATA_HOME/applications/icons
|
||||||
for i in $(find $script_dir/assets/icons -mindepth 1 -maxdepth 1 -type f); do
|
for i in $(find $script_dir/assets/icons -mindepth 1 -maxdepth 1 -type f); do
|
||||||
if [[ ! -f $XDG_DATA_HOME/applications/icons/$i ] && [ $dry_run == "0" ]]; then
|
if [[ ! -f $XDG_DATA_HOME/applications/icons/$i ]] && [[ $dry_run == "0" ]]; then
|
||||||
cp $i $XDG_DATA_HOME/applications/icons
|
cp $i $XDG_DATA_HOME/applications/icons
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -70,7 +70,7 @@ install() {
|
|||||||
--url $(echo $file | jq -r '.url') \
|
--url $(echo $file | jq -r '.url') \
|
||||||
--icon $(echo $file | jq -r '.icon') \
|
--icon $(echo $file | jq -r '.icon') \
|
||||||
--exec $(echo $file | jq -r '.exec') \
|
--exec $(echo $file | jq -r '.exec') \
|
||||||
--mime $(echo $file | jq -r '.mime')
|
--mime-types $(echo $file | jq -r '.mime_types')
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user