diff --git a/justfile b/justfile index 235a281..9b4d729 100644 --- a/justfile +++ b/justfile @@ -27,14 +27,14 @@ install: install -Dm0644 {{'resources' / 'polkit-1' / 'rules.d' / 'cosmic-settings.rules'}} {{polkit-rules-dst}} install -Dm0644 {{'resources' / 'polkit-1' / 'actions' / appid + '.Users.policy'}} {{policy-users-dst}} install -Dm0755 {{cargo-target-dir / 'release' / name}} {{bin-dst}} - cd resources && find * -type f -name '*.desktop' -exec install -Dm0644 '{}' '{{appdir}}/{}' \; + cd resources/applications && find * -type f -exec install -Dm0644 '{}' '{{appdir}}/{}' \; cd resources/default_schema && find * -type f -exec install -Dm0644 '{}' '{{default-schema-target}}/{}' \; cd resources/icons && find * -type f -exec install -Dm0644 '{}' '{{iconsdir}}/{}' \; # Uninstalls everything (requires same arguments as given to install) uninstall: rm {{bin-dst}} {{metainfo-dst}} {{polkit-rules-dst}} {{policy-users-dst}} - cd resources && find * -type f -name '*.desktop' -exec rm '{{appdir}}/{}' \; + cd resources/applications && find * -type f -exec rm '{{appdir}}/{}' \; cd resources/default_schema && find * -type f -exec rm '{{default-schema-target}}/{}' \; cd resources/icons && find * -type f -exec rm '{{iconsdir}}/{}' \; diff --git a/resources/com.system76.CosmicSettings.About.desktop b/resources/applications/com.system76.CosmicSettings.About.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.About.desktop rename to resources/applications/com.system76.CosmicSettings.About.desktop diff --git a/resources/com.system76.CosmicSettings.Accessibility.desktop b/resources/applications/com.system76.CosmicSettings.Accessibility.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Accessibility.desktop rename to resources/applications/com.system76.CosmicSettings.Accessibility.desktop diff --git a/resources/com.system76.CosmicSettings.Appearance.desktop b/resources/applications/com.system76.CosmicSettings.Appearance.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Appearance.desktop rename to resources/applications/com.system76.CosmicSettings.Appearance.desktop diff --git a/resources/com.system76.CosmicSettings.Applications.desktop b/resources/applications/com.system76.CosmicSettings.Applications.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Applications.desktop rename to resources/applications/com.system76.CosmicSettings.Applications.desktop diff --git a/resources/com.system76.CosmicSettings.Bluetooth.desktop b/resources/applications/com.system76.CosmicSettings.Bluetooth.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Bluetooth.desktop rename to resources/applications/com.system76.CosmicSettings.Bluetooth.desktop diff --git a/resources/com.system76.CosmicSettings.DateTime.desktop b/resources/applications/com.system76.CosmicSettings.DateTime.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.DateTime.desktop rename to resources/applications/com.system76.CosmicSettings.DateTime.desktop diff --git a/resources/com.system76.CosmicSettings.DefaultApps.desktop b/resources/applications/com.system76.CosmicSettings.DefaultApps.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.DefaultApps.desktop rename to resources/applications/com.system76.CosmicSettings.DefaultApps.desktop diff --git a/resources/com.system76.CosmicSettings.Desktop.desktop b/resources/applications/com.system76.CosmicSettings.Desktop.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Desktop.desktop rename to resources/applications/com.system76.CosmicSettings.Desktop.desktop diff --git a/resources/com.system76.CosmicSettings.Displays.desktop b/resources/applications/com.system76.CosmicSettings.Displays.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Displays.desktop rename to resources/applications/com.system76.CosmicSettings.Displays.desktop diff --git a/resources/com.system76.CosmicSettings.Dock.desktop b/resources/applications/com.system76.CosmicSettings.Dock.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Dock.desktop rename to resources/applications/com.system76.CosmicSettings.Dock.desktop diff --git a/resources/com.system76.CosmicSettings.Firmware.desktop b/resources/applications/com.system76.CosmicSettings.Firmware.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Firmware.desktop rename to resources/applications/com.system76.CosmicSettings.Firmware.desktop diff --git a/resources/com.system76.CosmicSettings.Input.desktop b/resources/applications/com.system76.CosmicSettings.Input.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Input.desktop rename to resources/applications/com.system76.CosmicSettings.Input.desktop diff --git a/resources/com.system76.CosmicSettings.Keyboard.desktop b/resources/applications/com.system76.CosmicSettings.Keyboard.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Keyboard.desktop rename to resources/applications/com.system76.CosmicSettings.Keyboard.desktop diff --git a/resources/com.system76.CosmicSettings.LegacyApplications.desktop b/resources/applications/com.system76.CosmicSettings.LegacyApplications.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.LegacyApplications.desktop rename to resources/applications/com.system76.CosmicSettings.LegacyApplications.desktop diff --git a/resources/com.system76.CosmicSettings.Mouse.desktop b/resources/applications/com.system76.CosmicSettings.Mouse.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Mouse.desktop rename to resources/applications/com.system76.CosmicSettings.Mouse.desktop diff --git a/resources/com.system76.CosmicSettings.Network.desktop b/resources/applications/com.system76.CosmicSettings.Network.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Network.desktop rename to resources/applications/com.system76.CosmicSettings.Network.desktop diff --git a/resources/com.system76.CosmicSettings.Notifications.desktop b/resources/applications/com.system76.CosmicSettings.Notifications.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Notifications.desktop rename to resources/applications/com.system76.CosmicSettings.Notifications.desktop diff --git a/resources/com.system76.CosmicSettings.Panel.desktop b/resources/applications/com.system76.CosmicSettings.Panel.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Panel.desktop rename to resources/applications/com.system76.CosmicSettings.Panel.desktop diff --git a/resources/com.system76.CosmicSettings.Power.desktop b/resources/applications/com.system76.CosmicSettings.Power.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Power.desktop rename to resources/applications/com.system76.CosmicSettings.Power.desktop diff --git a/resources/com.system76.CosmicSettings.RegionLanguage.desktop b/resources/applications/com.system76.CosmicSettings.RegionLanguage.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.RegionLanguage.desktop rename to resources/applications/com.system76.CosmicSettings.RegionLanguage.desktop diff --git a/resources/com.system76.CosmicSettings.Sound.desktop b/resources/applications/com.system76.CosmicSettings.Sound.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Sound.desktop rename to resources/applications/com.system76.CosmicSettings.Sound.desktop diff --git a/resources/com.system76.CosmicSettings.StartupApps.desktop b/resources/applications/com.system76.CosmicSettings.StartupApps.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.StartupApps.desktop rename to resources/applications/com.system76.CosmicSettings.StartupApps.desktop diff --git a/resources/com.system76.CosmicSettings.System.desktop b/resources/applications/com.system76.CosmicSettings.System.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.System.desktop rename to resources/applications/com.system76.CosmicSettings.System.desktop diff --git a/resources/com.system76.CosmicSettings.Time.desktop b/resources/applications/com.system76.CosmicSettings.Time.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Time.desktop rename to resources/applications/com.system76.CosmicSettings.Time.desktop diff --git a/resources/com.system76.CosmicSettings.Touchpad.desktop b/resources/applications/com.system76.CosmicSettings.Touchpad.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Touchpad.desktop rename to resources/applications/com.system76.CosmicSettings.Touchpad.desktop diff --git a/resources/com.system76.CosmicSettings.Users.desktop b/resources/applications/com.system76.CosmicSettings.Users.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Users.desktop rename to resources/applications/com.system76.CosmicSettings.Users.desktop diff --git a/resources/com.system76.CosmicSettings.Vpn.desktop b/resources/applications/com.system76.CosmicSettings.Vpn.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Vpn.desktop rename to resources/applications/com.system76.CosmicSettings.Vpn.desktop diff --git a/resources/com.system76.CosmicSettings.Wallpaper.desktop b/resources/applications/com.system76.CosmicSettings.Wallpaper.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Wallpaper.desktop rename to resources/applications/com.system76.CosmicSettings.Wallpaper.desktop diff --git a/resources/com.system76.CosmicSettings.WindowManagement.desktop b/resources/applications/com.system76.CosmicSettings.WindowManagement.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.WindowManagement.desktop rename to resources/applications/com.system76.CosmicSettings.WindowManagement.desktop diff --git a/resources/com.system76.CosmicSettings.Wired.desktop b/resources/applications/com.system76.CosmicSettings.Wired.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Wired.desktop rename to resources/applications/com.system76.CosmicSettings.Wired.desktop diff --git a/resources/com.system76.CosmicSettings.Wireless.desktop b/resources/applications/com.system76.CosmicSettings.Wireless.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Wireless.desktop rename to resources/applications/com.system76.CosmicSettings.Wireless.desktop diff --git a/resources/com.system76.CosmicSettings.Workspaces.desktop b/resources/applications/com.system76.CosmicSettings.Workspaces.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.Workspaces.desktop rename to resources/applications/com.system76.CosmicSettings.Workspaces.desktop diff --git a/resources/com.system76.CosmicSettings.desktop b/resources/applications/com.system76.CosmicSettings.desktop similarity index 100% rename from resources/com.system76.CosmicSettings.desktop rename to resources/applications/com.system76.CosmicSettings.desktop