Skip to content

Commit d674df3

Browse files
committed
Align shell theme validation with root quickshell module paths
1 parent 331c209 commit d674df3

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

airootfs/root/customize_airootfs.d/05-shell-theme.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ validate_shell_theme() {
2525
return 0
2626
fi
2727

28-
if [[ ! -f "${THEME_INSTALL_DIR}/scripts/quickshell/notifications/NotificationPopup.qml" ]]; then
29-
echo "WARNING: Theme is missing scripts/quickshell/notifications/NotificationPopup.qml"
28+
if [[ ! -f "${THEME_INSTALL_DIR}/scripts/quickshell/widgets/notifications/NotificationPopup.qml" ]]; then
29+
echo "WARNING: Theme is missing scripts/quickshell/widgets/notifications/NotificationPopup.qml"
3030
return 0
3131
fi
3232

33-
if [[ ! -f "${THEME_INSTALL_DIR}/scripts/quickshell/i18n/I18n.qml" ]]; then
34-
echo "WARNING: Theme is missing scripts/quickshell/i18n/I18n.qml"
33+
if [[ ! -f "${THEME_INSTALL_DIR}/scripts/quickshell/lib/I18n.qml" ]]; then
34+
echo "WARNING: Theme is missing scripts/quickshell/lib/I18n.qml"
3535
return 0
3636
fi
3737

tests/test_installer_integration.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,10 @@ def test_shell_theme_validation_uses_start_script_path(self):
231231
self.assertIn('"${THEME_INSTALL_DIR}/scripts/quickshell/Main.qml"', content)
232232
self.assertIn('"${THEME_INSTALL_DIR}/scripts/quickshell/TopBar.qml"', content)
233233
self.assertIn(
234-
'"${THEME_INSTALL_DIR}/scripts/quickshell/notifications/NotificationPopup.qml"', content
234+
'"${THEME_INSTALL_DIR}/scripts/quickshell/widgets/notifications/NotificationPopup.qml"',
235+
content,
235236
)
236-
self.assertIn('"${THEME_INSTALL_DIR}/scripts/quickshell/i18n/I18n.qml"', content)
237+
self.assertIn('"${THEME_INSTALL_DIR}/scripts/quickshell/lib/I18n.qml"', content)
237238
self.assertIn('"${THEME_INSTALL_DIR}/config/hypr/scripts/init.sh"', content)
238239

239240
def test_shellbar_uses_scripts_quickshell_layout(self):

0 commit comments

Comments
 (0)