1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00

Merge 3f51b3947d53a84d35d99a01f09051dba614c87f into 3278173ef810935e07808deed58783c1bc7ca4cf

This commit is contained in:
Luke Dennis 2024-11-28 04:18:48 +01:00 committed by GitHub
commit c3483ae1b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -52,6 +52,9 @@ xdg_install_f() {
# Install Arduino mime type # Install Arduino mime type
xdg-mime install "${SCRIPT_PATH}/lib/${RESOURCE_NAME}.xml" xdg-mime install "${SCRIPT_PATH}/lib/${RESOURCE_NAME}.xml"
mkdir -p "${HOME}/.local/share/metainfo"
cp "${SCRIPT_PATH}/appdata.xml" "${HOME}/.local/share/metainfo/${RESOURCE_NAME}.appdata.xml"
# Install icons for mime type # Install icons for mime type
xdg-icon-resource install --context mimetypes --size 16 "${SCRIPT_PATH}/lib/icons/16x16/apps/arduino.png" text-x-arduino xdg-icon-resource install --context mimetypes --size 16 "${SCRIPT_PATH}/lib/icons/16x16/apps/arduino.png" text-x-arduino
xdg-icon-resource install --context mimetypes --size 24 "${SCRIPT_PATH}/lib/icons/24x24/apps/arduino.png" text-x-arduino xdg-icon-resource install --context mimetypes --size 24 "${SCRIPT_PATH}/lib/icons/24x24/apps/arduino.png" text-x-arduino
@ -71,7 +74,6 @@ xdg_install_f() {
fi fi
# Add symlink for arduino so it's in users path # Add symlink for arduino so it's in users path
echo "" # Ensure password request message is on new line
if ! ln -s ${SCRIPT_PATH}/arduino /usr/local/bin/arduino; then if ! ln -s ${SCRIPT_PATH}/arduino /usr/local/bin/arduino; then
echo "Adding symlink failed. Hope that's OK. If not then rerun as root with sudo." echo "Adding symlink failed. Hope that's OK. If not then rerun as root with sudo."
fi fi
@ -112,7 +114,6 @@ simple_install_f() {
fi fi
# Add symlink for arduino so it's in users path # Add symlink for arduino so it's in users path
echo "" # Ensure password request message is on new line
if ! ln -s ${SCRIPT_PATH}/arduino /usr/local/bin/arduino; then if ! ln -s ${SCRIPT_PATH}/arduino /usr/local/bin/arduino; then
echo "Adding symlink failed. Hope that's OK. If not then rerun as root with sudo." echo "Adding symlink failed. Hope that's OK. If not then rerun as root with sudo."
fi fi
@ -157,8 +158,11 @@ xdg_uninstall_f() {
# Remove Arduino MIME type # Remove Arduino MIME type
xdg-mime uninstall "${SCRIPT_PATH}/lib/${RESOURCE_NAME}.xml" xdg-mime uninstall "${SCRIPT_PATH}/lib/${RESOURCE_NAME}.xml"
if [ -f "${HOME}/.local/share/metainfo/${RESOURCE_NAME}.appdata.xml" ]; then
rm "${HOME}/.local/share/metainfo/${RESOURCE_NAME}.appdata.xml"
fi
# Remove symlink for arduino # Remove symlink for arduino
echo "" # Ensure password request message is on new line
if [ -f /usr/local/bin/arduino ]; then if [ -f /usr/local/bin/arduino ]; then
rm /usr/local/bin/arduino || echo "Removing symlink failed. Hope that's OK. If not then rerun as root with sudo." rm /usr/local/bin/arduino || echo "Removing symlink failed. Hope that's OK. If not then rerun as root with sudo."
fi fi
@ -195,7 +199,6 @@ simple_uninstall_f() {
fi fi
# Remove symlink for arduino # Remove symlink for arduino
echo "" # Ensure password request message is on new line
if [ -f /usr/local/bin/arduino ]; then if [ -f /usr/local/bin/arduino ]; then
rm /usr/local/bin/arduino || echo "Removing symlink failed. Hope that's OK. If not then rerun as root with sudo." rm /usr/local/bin/arduino || echo "Removing symlink failed. Hope that's OK. If not then rerun as root with sudo."
fi fi