diff --git a/src/mods/07-system-tools-install-mod/install.sh b/src/mods/07-system-tools-install-mod/install.sh index fa6a4221..93e2d0a1 100755 --- a/src/mods/07-system-tools-install-mod/install.sh +++ b/src/mods/07-system-tools-install-mod/install.sh @@ -94,12 +94,21 @@ apt install $INTERACTIVE \ gettext \ cracklib-runtime \ libfuse2t64 \ - libfuse3-4 \ libopengl0 \ initramfs-tools \ --no-install-recommends judge "Install basic system tool packages" +print_ok "Installing libfuse for specific release..." +case $TARGET_UBUNTU_VERSION in + "questing") + apt-get install $INTERACTIVE libfuse3-4 --no-install-recommends + ;; + *) + apt-get install $INTERACTIVE libfuse3-3 --no-install-recommends + ;; +esac + print_ok "Fixing the package base-files to avoid system upgrading it..." # Fix the package base-files to avoid system upgrading it. This is because Ubuntu may upgrade the package base-files and caused AnduinOS to be changed to Ubuntu. # This will edit the file /var/lib/dpkg/status and change the status of the package base-files to hold. @@ -112,4 +121,4 @@ Package: base-files Pin: release o=Ubuntu Pin-Priority: -1 EOF -judge "Create PIN file for base-files" \ No newline at end of file +judge "Create PIN file for base-files" diff --git a/src/mods/14-gnome-apps-mod/install.sh b/src/mods/14-gnome-apps-mod/install.sh index cf6c85d7..b5a98b54 100755 --- a/src/mods/14-gnome-apps-mod/install.sh +++ b/src/mods/14-gnome-apps-mod/install.sh @@ -174,7 +174,7 @@ judge "Install gnome printer support" print_ok "Installing ubuntu drivers support..." apt install $INTERACTIVE \ - ubuntu-drivers-common alsa-utils alsa-base fprintd --no-install-recommends + ubuntu-drivers-common alsa-utils alsa-base fprintd printer-driver-all --no-install-recommends judge "Install ubuntu drivers support" print_ok "Installing python3..." @@ -202,4 +202,4 @@ judge "Remove the default vim.desktop file" print_ok "Installing $LANGUAGE_PACKS language packs" apt install $INTERACTIVE $LANGUAGE_PACKS --no-install-recommends -judge "Install language packs" \ No newline at end of file +judge "Install language packs" diff --git a/src/mods/15-fonts-mod/install.sh b/src/mods/15-fonts-mod/install.sh index bb517332..fd49bc2c 100755 --- a/src/mods/15-fonts-mod/install.sh +++ b/src/mods/15-fonts-mod/install.sh @@ -10,7 +10,7 @@ set -u # treat unset variable as error # | Korean | `ko`, `ko_KR` | Noto Sans CJK KR | Noto Serif CJK KR | Noto Sans Mono CJK KR | `lang=ko`, prepend-strong: use KR variants for Korean | # | Thai | `th`, `th_TH` | Noto Sans Thai | Noto Serif Thai | Cascadia Code | `lang=th`, prepend-strong: use Thai fonts; code blocks → Cascadia Code | # | Arabic | `ar`, `ar_SA` | Noto Naskh Arabic | Noto Naskh Arabic | Cascadia Code | `lang=ar`, prepend-strong: use Naskh Arabic; code blocks → Cascadia Code | -# | Latin & Cyrillic | `en_US`, `en_GB`, `de_DE`, `fr_FR`, `es_ES`, `it_IT`, `pt_BR`, `pt_PT`, `nl_NL`, `sv_SE`, `pl_PL`, `tr_TR`, `vi_VN`, `ru_RU` | Noto Sans | Noto Serif | Cascadia Code | `lang contains X`, prepend-strong: use pure Latin/Cyrillic fonts before CJK to fix punctuation | +# | Latin & Cyrillic | `en_US`, `en_GB`, `de_DE`, `fr_FR`, `es_ES`, `it_IT`, `pt_BR`, `pt_PT`, `nl_NL`, `sv_SE`, `pl_PL`, `tr_TR`, `vi_VN`, `ru_RU`, `ro_RO` | Noto Sans | Noto Serif | Cascadia Code | `lang contains X`, prepend-strong: use pure Latin/Cyrillic fonts before CJK to fix punctuation | # | Generic fallback | * | Noto Sans CJK SC | Noto Serif CJK SC | Noto Sans Mono CJK SC + Symbols Nerd Font + Twitter Color Emoji | default sans/serif/mono rules for all other or mixed content | print_ok "Patching fonts..." @@ -20,4 +20,4 @@ judge "Patch fonts" print_ok "Updating font cache" fc-cache -f -judge "Update font cache" \ No newline at end of file +judge "Update font cache" diff --git a/src/mods/20-deskmon-mod/deskmon.c b/src/mods/20-deskmon-mod/deskmon.c index 97185928..19f5a728 100644 --- a/src/mods/20-deskmon-mod/deskmon.c +++ b/src/mods/20-deskmon-mod/deskmon.c @@ -1,7 +1,7 @@ // ==================== // File: deskmon.c // Daemon: watch ~/Desktop for new .desktop files, chmod +x and mark as trusted -// Compile: gcc `pkg-config --cflags --libs gio-2.0 glib-2.0` -O2 -o deskmon deskmon.c +// Compile: gcc `pkg-config --cflags gio-2.0 glib-2.0` -O2 -o deskmon deskmon.c `pkg-config --libs gio-2.0 glib-2.0` // Install to /usr/local/bin/deskmon and run via systemd user service #define _GNU_SOURCE diff --git a/src/mods/29-gnome-extension-anduinos-switcher/switcher@anduinos/extension.js b/src/mods/29-gnome-extension-anduinos-switcher/switcher@anduinos/extension.js index 20df42d8..575e69f9 100644 --- a/src/mods/29-gnome-extension-anduinos-switcher/switcher@anduinos/extension.js +++ b/src/mods/29-gnome-extension-anduinos-switcher/switcher@anduinos/extension.js @@ -6,6 +6,20 @@ import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js'; const LIGHT_SCHEME_NAME = 'prefer-light'; const DARK_SCHEME_NAME = 'prefer-dark'; +const GLib = imports.gi.GLib; + +function runCommand(command) { + try { + let [stdout, stderr, exit_status] = GLib.spawn_command_line_sync(command); + if (exit_status !== 0) { + global.log(`Error running command: ${stderr}`); + } else { + global.log(`Command output: ${stdout}`); + } + } catch (e) { + global.log(`Error running command: ${e}`); + } +} const LIGHT_THEME_SETTINGS = { "org.gnome.desktop.interface": { @@ -85,8 +99,12 @@ export default class LightDarkSwitcherExtension extends Extension { _syncTheme() { let scheme = this._interfaceSettings.get_string('color-scheme'); if (scheme === DARK_SCHEME_NAME) { + GLib.spawn_async(null, ['sh', '-c', "rm -rf $HOME/.config/gtk-4.0/*"], null, GLib.SpawnFlags.SEARCH_PATH, null); + GLib.spawn_async(null, ['sh', '-c', "ln -sf /usr/share/themes/Fluent-round-Dark/gtk-4.0/* $HOME/.config/gtk-4.0/"], null, GLib.SpawnFlags.SEARCH_PATH, null); applySettings(DARK_THEME_SETTINGS); } else { + GLib.spawn_async(null, ['sh', '-c', "rm -rf $HOME/.config/gtk-4.0/*"], null, GLib.SpawnFlags.SEARCH_PATH, null); + GLib.spawn_async(null, ['sh', '-c', "ln -sf /usr/share/themes/Fluent-round-Light/gtk-4.0/* $HOME/.config/gtk-4.0/"], null, GLib.SpawnFlags.SEARCH_PATH, null); applySettings(LIGHT_THEME_SETTINGS); } } diff --git a/src/mods/35-dconf-patch/dconf.ini b/src/mods/35-dconf-patch/dconf.ini index 545e80a6..5716be78 100644 --- a/src/mods/35-dconf-patch/dconf.ini +++ b/src/mods/35-dconf-patch/dconf.ini @@ -359,6 +359,7 @@ actual-city=0 has-run=true locs=[(uint32 0, '上海市, 中国', uint32 0, '31.2312707,121.4700152')] my-loc-prov='geoclue' +owm-api-translate=true position-in-panel='left' position-index=0 pressure-unit='mbar' diff --git a/src/mods/39-templates-mod/install.sh b/src/mods/39-templates-mod/install.sh index 8d518e97..016e52b1 100755 --- a/src/mods/39-templates-mod/install.sh +++ b/src/mods/39-templates-mod/install.sh @@ -2,11 +2,35 @@ set -e # exit on error set -o pipefail # exit on pipeline error set -u # treat unset variable as error -print_ok "Configuring templates..." -mkdir -p /etc/skel/Templates -touch /etc/skel/Templates/Text.txt -touch /etc/skel/Templates/Markdown.md -cat << 'EOF' > /etc/skel/Templates/Markdown.md +print_ok "Declare Templates dir name as variable for specific languages..." +case $LANG_MODE in + "ro_RO") + export TEMPLATE_DIR="Șabloane" + print_ok "Configuring templates..." + mkdir -p /etc/skel/$TEMPLATE_DIR + touch /etc/skel/$TEMPLATE_DIR/Text.txt + touch /etc/skel/$TEMPLATE_DIR/Markdown.md +cat << 'EOF' > /etc/skel/$TEMPLATE_DIR/Markdown.md +# Titlu + +- [ ] De realizat 1 +- [ ] De realizat 2 +- [ ] De realizat 3 + +## Subtitlu + +1. Lista 1 +2. Lista 2 +3. Lista 3 +EOF + ;; + *) + export TEMPLATE_DIR="Templates" + print_ok "Configuring templates..." + mkdir -p /etc/skel/$TEMPLATE_DIR + touch /etc/skel/$TEMPLATE_DIR/Text.txt + touch /etc/skel/$TEMPLATE_DIR/Markdown.md +cat << 'EOF' > /etc/skel/$TEMPLATE_DIR/Markdown.md # Title - [ ] Task 1 @@ -19,4 +43,6 @@ cat << 'EOF' > /etc/skel/Templates/Markdown.md 2. Numbered 2 3. Numbered 3 EOF -judge "Configure templates" \ No newline at end of file + ;; +esac +judge "Configure templates"