From 5a846cdec53d9657d444357d8c51734da55b9394 Mon Sep 17 00:00:00 2001 From: clsty Date: Sun, 26 Oct 2025 21:27:41 +0800 Subject: [PATCH] Move sdist/ID to sdata/dist-ID --- .../workflows/dist-update-notification.yml | 6 ++-- README.md | 2 +- sdata/deps-info.md | 8 ++--- {sdist/arch => sdata/dist-arch}/.gitignore | 0 {sdist/arch => sdata/dist-arch}/README.md | 2 +- .../illogical-impulse-audio/PKGBUILD | 0 .../illogical-impulse-backlight/PKGBUILD | 0 .../illogical-impulse-basic/PKGBUILD | 0 .../PKGBUILD | 0 .../illogical-impulse-fonts-themes/PKGBUILD | 0 .../illogical-impulse-hyprland/PKGBUILD | 0 .../dist-arch}/illogical-impulse-kde/PKGBUILD | 0 .../illogical-impulse-microtex-git/.gitignore | 0 .../illogical-impulse-microtex-git/PKGBUILD | 0 .../.gitignore | 0 .../PKGBUILD | 0 .../illogical-impulse-portal/PKGBUILD | 0 .../illogical-impulse-python/PKGBUILD | 0 .../illogical-impulse-quickshell-git/PKGBUILD | 0 .../quickshell-check.hook | 0 .../illogical-impulse-screencapture/PKGBUILD | 0 .../illogical-impulse-toolkit/PKGBUILD | 0 .../illogical-impulse-widgets/PKGBUILD | 0 .../arch => sdata/dist-arch}/install-deps.sh | 16 ++++----- .../dist-arch}/install-setups.sh | 0 .../dist-arch}/outdate-detect-mode | 0 .../dist-arch}/previous_dependencies.conf | 0 .../dist-fallback}/install-deps.sh | 0 .../dist-fallback}/install-setups.sh | 0 .../dist-fallback}/outdate-detect-mode | 0 {sdist/gentoo => sdata/dist-gentoo}/README.md | 8 ++--- .../dist-gentoo}/additional-useflags | 0 .../illogical-impulse-audio-1.0-r1.ebuild | 0 .../illogical-impulse-backlight-1.0-r1.ebuild | 0 .../illogical-impulse-basic-1.0-r1.ebuild | 0 ...-bibata-modern-classic-bin-2.0.6-r1.ebuild | 0 ...logical-impulse-fonts-themes-1.0-r1.ebuild | 0 .../hyprgraphics-9999.ebuild | 0 .../hyprland-qt-support-9999.ebuild | 0 .../hyprland-qtutils-9999.ebuild | 0 .../hyprlang-9999.ebuild | 0 .../hyprwayland-scanner-9999.ebuild | 0 .../illogical-impulse-hyprland-1.0-r1.ebuild | 0 .../illogical-impulse-kde-1.0-r1.ebuild | 0 ...logical-impulse-microtex-git-1.0-r1.ebuild | 0 ...cal-impulse-oneui4-icons-git-1.0-r1.ebuild | 0 .../illogical-impulse-portal-1.0-r1.ebuild | 0 .../illogical-impulse-python-1.1-r1.ebuild | 0 ...ical-impulse-quickshell-git-9999-r2.ebuild | 0 ...ogical-impulse-screencapture-1.0-r1.ebuild | 0 .../illogical-impulse-toolkit-1.0-r1.ebuild | 0 .../illogical-impulse-widgets-1.0-r2.ebuild | 0 .../dist-gentoo}/install-deps.sh | 24 ++++++------- .../dist-gentoo}/install-setups.sh | 0 {sdist/gentoo => sdata/dist-gentoo}/keywords | 0 .../dist-gentoo}/outdate-detect-mode | 0 {sdist/gentoo => sdata/dist-gentoo}/useflags | 0 {sdist/nix => sdata/dist-nix}/README.md | 4 +-- {sdist/nix => sdata/dist-nix}/install-deps.sh | 0 .../dist-nix}/outdate-detect-mode | 0 sdata/step/1.install-deps-selector.sh | 36 +++++++++---------- sdata/step/2.install-setups-selector.sh | 24 ++++++------- sdata/step/exp-update-old.sh | 8 ++--- sdata/step/exp-update-tester.sh | 2 +- sdata/step/exp-update.sh | 6 ++-- sdist/README.md | 1 - 66 files changed, 73 insertions(+), 74 deletions(-) rename {sdist/arch => sdata/dist-arch}/.gitignore (100%) rename {sdist/arch => sdata/dist-arch}/README.md (92%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-audio/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-backlight/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-basic/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-bibata-modern-classic-bin/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-fonts-themes/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-hyprland/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-kde/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-microtex-git/.gitignore (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-microtex-git/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-oneui4-icons-git/.gitignore (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-oneui4-icons-git/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-portal/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-python/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-quickshell-git/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-quickshell-git/quickshell-check.hook (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-screencapture/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-toolkit/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/illogical-impulse-widgets/PKGBUILD (100%) rename {sdist/arch => sdata/dist-arch}/install-deps.sh (86%) rename {sdist/arch => sdata/dist-arch}/install-setups.sh (100%) rename {sdist/arch => sdata/dist-arch}/outdate-detect-mode (100%) rename {sdist/arch => sdata/dist-arch}/previous_dependencies.conf (100%) rename {sdist/fallback => sdata/dist-fallback}/install-deps.sh (100%) rename {sdist/fallback => sdata/dist-fallback}/install-setups.sh (100%) rename {sdist/fallback => sdata/dist-fallback}/outdate-detect-mode (100%) rename {sdist/gentoo => sdata/dist-gentoo}/README.md (88%) rename {sdist/gentoo => sdata/dist-gentoo}/additional-useflags (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-audio/illogical-impulse-audio-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-backlight/illogical-impulse-backlight-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-basic/illogical-impulse-basic-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-bibata-modern-classic-bin/illogical-impulse-bibata-modern-classic-bin-2.0.6-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-fonts-themes/illogical-impulse-fonts-themes-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-hyprland/hyprgraphics-9999.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-hyprland/hyprland-qt-support-9999.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-hyprland/hyprland-qtutils-9999.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-hyprland/hyprlang-9999.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-hyprland/hyprwayland-scanner-9999.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-hyprland/illogical-impulse-hyprland-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-kde/illogical-impulse-kde-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-microtex-git/illogical-impulse-microtex-git-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-oneui4-icons-git/illogical-impulse-oneui4-icons-git-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-portal/illogical-impulse-portal-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-python/illogical-impulse-python-1.1-r1.ebuild (100%) rename sdist/gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r1.ebuild => sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r2.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-screencapture/illogical-impulse-screencapture-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-toolkit/illogical-impulse-toolkit-1.0-r1.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild (100%) rename {sdist/gentoo => sdata/dist-gentoo}/install-deps.sh (74%) rename {sdist/gentoo => sdata/dist-gentoo}/install-setups.sh (100%) rename {sdist/gentoo => sdata/dist-gentoo}/keywords (100%) rename {sdist/gentoo => sdata/dist-gentoo}/outdate-detect-mode (100%) rename {sdist/gentoo => sdata/dist-gentoo}/useflags (100%) rename {sdist/nix => sdata/dist-nix}/README.md (93%) rename {sdist/nix => sdata/dist-nix}/install-deps.sh (100%) rename {sdist/nix => sdata/dist-nix}/outdate-detect-mode (100%) delete mode 100644 sdist/README.md diff --git a/.github/workflows/dist-update-notification.yml b/.github/workflows/dist-update-notification.yml index 93414ec15..341a906e8 100644 --- a/.github/workflows/dist-update-notification.yml +++ b/.github/workflows/dist-update-notification.yml @@ -1,9 +1,9 @@ -name: Comment on Discussion When sdist/arch/ Changes +name: Comment on Discussion When sdata/dist-arch/ Changes on: push: paths: - - 'sdist/arch/**' + - 'sdata/dist-arch/**' # workflow_dispatch: jobs: @@ -18,7 +18,7 @@ jobs: # https://docs.github.com/en/graphql/reference/mutations#adddiscussioncomment run: | MESSAGE="**Auto notification:**\n" - MESSAGE+="Directory \`sdist/arch\` has been updated.\n" + MESSAGE+="Directory \`sdata/dist-arch\` has been updated.\n" MESSAGE+="Commit HASH: ${{ github.sha }}\n" MESSAGE+="Commit message: ${{ github.event.head_commit.message }}" REPO_OWNER="${{ github.repository_owner }}" diff --git a/README.md b/README.md index ab8306427..85a0330c7 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ | [Hyprland](https://github.com/hyprwm/hyprland) | The compositor (manages and renders windows) | | [Quickshell](https://quickshell.outfoxxed.me/) | A QtQuick-based widget system, used for the status bar, sidebars, etc. | - - For the full list of dependencies, see the [sdist/arch folder](https://github.com/end-4/dots-hyprland/tree/main/sdist/arch) + - For the full list of dependencies, see the [sdata/dist-arch folder](https://github.com/end-4/dots-hyprland/tree/main/sdata/dist-arch) - THERE IS NO WAYBAR STOP FUCKING CALLING EVERY BAR WAYBAR diff --git a/sdata/deps-info.md b/sdata/deps-info.md index a6fe2bc86..6151d6f05 100644 --- a/sdata/deps-info.md +++ b/sdata/deps-info.md @@ -3,7 +3,7 @@ This file was generated by AI (see [#2102](https://github.com/end-4/dots-hyprlan It still needs manual correction. ## Information -Meta-packages (from sdist/arch/install-deps.sh) +Meta-packages (from sdata/dist-arch/install-deps.sh) - illogical-impulse-basic - Purpose: Core shell tooling used by scripts (general CLI utilities, build helpers, JSON processing, etc.). - illogical-impulse-audio @@ -74,13 +74,13 @@ Concrete dependencies inferred from repository scripts - Used by: switchwall.sh to set GNOME interface color-scheme and GTK theme. - Purpose: System settings manipulation. - yay (or yay-bin from AUR) - - Used by: sdist/arch/install-deps.sh to build/install local PKGBUILDs and dependencies. + - Used by: sdata/dist-arch/install-deps.sh to build/install local PKGBUILDs and dependencies. - Purpose: AUR helper used by installer. - base-devel, git, makepkg (core Arch tooling) - - Used by: sdist/arch/install-deps.sh and update.sh for building AUR/PKGBUILD packages and repository management. + - Used by: sdata/dist-arch/install-deps.sh and update.sh for building AUR/PKGBUILD packages and repository management. - Purpose: Build toolchain and VCS for packaging. Notes - Some Hyprland-adjacent packages appear in a legacy removal list as -git variants (e.g., hypridle, hyprlock, xdg-desktop-portal-hyprland). This suggests the meta-packages likely standardized on stable repo versions now. -- Exact package lists per meta-package should be verified against the PKGBUILD files in sdist/arch/*; the above is aligned with how the code uses these tools. +- Exact package lists per meta-package should be verified against the PKGBUILD files in sdata/dist-arch/*; the above is aligned with how the code uses these tools. diff --git a/sdist/arch/.gitignore b/sdata/dist-arch/.gitignore similarity index 100% rename from sdist/arch/.gitignore rename to sdata/dist-arch/.gitignore diff --git a/sdist/arch/README.md b/sdata/dist-arch/README.md similarity index 92% rename from sdist/arch/README.md rename to sdata/dist-arch/README.md index 0bd26252b..ca09069bd 100644 --- a/sdist/arch/README.md +++ b/sdata/dist-arch/README.md @@ -6,7 +6,7 @@ The old deps install method mainly involved `./sdata/dependencies.conf` (which has been removed now). ## Current Dependency Installation -Local PKGBUILDs under `./sdist/arch/` are used to install dependencies. +Local PKGBUILDs under `./sdata/dist-arch/` are used to install dependencies. The mechanism is introduced by [Makrennel](https://github.com/Makrennel) in [PR#570](https://github.com/end-4/dots-hyprland/pull/570). diff --git a/sdist/arch/illogical-impulse-audio/PKGBUILD b/sdata/dist-arch/illogical-impulse-audio/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-audio/PKGBUILD rename to sdata/dist-arch/illogical-impulse-audio/PKGBUILD diff --git a/sdist/arch/illogical-impulse-backlight/PKGBUILD b/sdata/dist-arch/illogical-impulse-backlight/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-backlight/PKGBUILD rename to sdata/dist-arch/illogical-impulse-backlight/PKGBUILD diff --git a/sdist/arch/illogical-impulse-basic/PKGBUILD b/sdata/dist-arch/illogical-impulse-basic/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-basic/PKGBUILD rename to sdata/dist-arch/illogical-impulse-basic/PKGBUILD diff --git a/sdist/arch/illogical-impulse-bibata-modern-classic-bin/PKGBUILD b/sdata/dist-arch/illogical-impulse-bibata-modern-classic-bin/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-bibata-modern-classic-bin/PKGBUILD rename to sdata/dist-arch/illogical-impulse-bibata-modern-classic-bin/PKGBUILD diff --git a/sdist/arch/illogical-impulse-fonts-themes/PKGBUILD b/sdata/dist-arch/illogical-impulse-fonts-themes/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-fonts-themes/PKGBUILD rename to sdata/dist-arch/illogical-impulse-fonts-themes/PKGBUILD diff --git a/sdist/arch/illogical-impulse-hyprland/PKGBUILD b/sdata/dist-arch/illogical-impulse-hyprland/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-hyprland/PKGBUILD rename to sdata/dist-arch/illogical-impulse-hyprland/PKGBUILD diff --git a/sdist/arch/illogical-impulse-kde/PKGBUILD b/sdata/dist-arch/illogical-impulse-kde/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-kde/PKGBUILD rename to sdata/dist-arch/illogical-impulse-kde/PKGBUILD diff --git a/sdist/arch/illogical-impulse-microtex-git/.gitignore b/sdata/dist-arch/illogical-impulse-microtex-git/.gitignore similarity index 100% rename from sdist/arch/illogical-impulse-microtex-git/.gitignore rename to sdata/dist-arch/illogical-impulse-microtex-git/.gitignore diff --git a/sdist/arch/illogical-impulse-microtex-git/PKGBUILD b/sdata/dist-arch/illogical-impulse-microtex-git/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-microtex-git/PKGBUILD rename to sdata/dist-arch/illogical-impulse-microtex-git/PKGBUILD diff --git a/sdist/arch/illogical-impulse-oneui4-icons-git/.gitignore b/sdata/dist-arch/illogical-impulse-oneui4-icons-git/.gitignore similarity index 100% rename from sdist/arch/illogical-impulse-oneui4-icons-git/.gitignore rename to sdata/dist-arch/illogical-impulse-oneui4-icons-git/.gitignore diff --git a/sdist/arch/illogical-impulse-oneui4-icons-git/PKGBUILD b/sdata/dist-arch/illogical-impulse-oneui4-icons-git/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-oneui4-icons-git/PKGBUILD rename to sdata/dist-arch/illogical-impulse-oneui4-icons-git/PKGBUILD diff --git a/sdist/arch/illogical-impulse-portal/PKGBUILD b/sdata/dist-arch/illogical-impulse-portal/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-portal/PKGBUILD rename to sdata/dist-arch/illogical-impulse-portal/PKGBUILD diff --git a/sdist/arch/illogical-impulse-python/PKGBUILD b/sdata/dist-arch/illogical-impulse-python/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-python/PKGBUILD rename to sdata/dist-arch/illogical-impulse-python/PKGBUILD diff --git a/sdist/arch/illogical-impulse-quickshell-git/PKGBUILD b/sdata/dist-arch/illogical-impulse-quickshell-git/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-quickshell-git/PKGBUILD rename to sdata/dist-arch/illogical-impulse-quickshell-git/PKGBUILD diff --git a/sdist/arch/illogical-impulse-quickshell-git/quickshell-check.hook b/sdata/dist-arch/illogical-impulse-quickshell-git/quickshell-check.hook similarity index 100% rename from sdist/arch/illogical-impulse-quickshell-git/quickshell-check.hook rename to sdata/dist-arch/illogical-impulse-quickshell-git/quickshell-check.hook diff --git a/sdist/arch/illogical-impulse-screencapture/PKGBUILD b/sdata/dist-arch/illogical-impulse-screencapture/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-screencapture/PKGBUILD rename to sdata/dist-arch/illogical-impulse-screencapture/PKGBUILD diff --git a/sdist/arch/illogical-impulse-toolkit/PKGBUILD b/sdata/dist-arch/illogical-impulse-toolkit/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-toolkit/PKGBUILD rename to sdata/dist-arch/illogical-impulse-toolkit/PKGBUILD diff --git a/sdist/arch/illogical-impulse-widgets/PKGBUILD b/sdata/dist-arch/illogical-impulse-widgets/PKGBUILD similarity index 100% rename from sdist/arch/illogical-impulse-widgets/PKGBUILD rename to sdata/dist-arch/illogical-impulse-widgets/PKGBUILD diff --git a/sdist/arch/install-deps.sh b/sdata/dist-arch/install-deps.sh similarity index 86% rename from sdist/arch/install-deps.sh rename to sdata/dist-arch/install-deps.sh index 9e1503fec..c799369aa 100644 --- a/sdist/arch/install-deps.sh +++ b/sdata/dist-arch/install-deps.sh @@ -13,12 +13,12 @@ install-yay(){ } # NOTE: `handle-deprecated-dependencies` was for the old days when we just switch from dependencies.conf to local PKGBUILDs. -# However, let's just keep it as references for other distros writing their `sdist//install-deps.sh`, if they need it. +# However, let's just keep it as references for other distros writing their `sdata/dist-/install-deps.sh`, if they need it. handle-deprecated-dependencies(){ printf "${STY_CYAN}[$0]: Removing deprecated dependencies:${STY_RST}\n" for i in illogical-impulse-{microtex,pymyc-aur} {quickshell,hyprutils,hyprpicker,hyprlang,hypridle,hyprland-qt-support,hyprland-qtutils,hyprlock,xdg-desktop-portal-hyprland,hyprcursor,hyprwayland-scanner,hyprland}-git;do try sudo pacman --noconfirm -Rdd $i;done # Convert old dependencies to non explicit dependencies so that they can be orphaned if not in meta packages - remove_bashcomments_emptylines ./sdist/arch/previous_dependencies.conf ./cache/old_deps_stripped.conf + remove_bashcomments_emptylines ./sdata/dist-arch/previous_dependencies.conf ./cache/old_deps_stripped.conf readarray -t old_deps_list < ./cache/old_deps_stripped.conf pacman -Qeq > ./cache/pacman_explicit_packages readarray -t explicitly_installed < ./cache/pacman_explicit_packages @@ -75,13 +75,13 @@ install-local-pkgbuild() { } # Install core dependencies from the meta-packages -metapkgs=(./sdist/arch/illogical-impulse-{audio,backlight,basic,fonts-themes,kde,portal,python,screencapture,toolkit,widgets}) -metapkgs+=(./sdist/arch/illogical-impulse-hyprland) -metapkgs+=(./sdist/arch/illogical-impulse-microtex-git) -metapkgs+=(./sdist/arch/illogical-impulse-quickshell-git) -# metapkgs+=(./sdist/arch/packages/illogical-impulse-oneui4-icons-git) +metapkgs=(./sdata/dist-arch/illogical-impulse-{audio,backlight,basic,fonts-themes,kde,portal,python,screencapture,toolkit,widgets}) +metapkgs+=(./sdata/dist-arch/illogical-impulse-hyprland) +metapkgs+=(./sdata/dist-arch/illogical-impulse-microtex-git) +metapkgs+=(./sdata/dist-arch/illogical-impulse-quickshell-git) +# metapkgs+=(./sdata/dist-arch/packages/illogical-impulse-oneui4-icons-git) [[ -f /usr/share/icons/Bibata-Modern-Classic/index.theme ]] || \ - metapkgs+=(./sdist/arch/illogical-impulse-bibata-modern-classic-bin) + metapkgs+=(./sdata/dist-arch/illogical-impulse-bibata-modern-classic-bin) for i in "${metapkgs[@]}"; do metainstallflags="--needed" diff --git a/sdist/arch/install-setups.sh b/sdata/dist-arch/install-setups.sh similarity index 100% rename from sdist/arch/install-setups.sh rename to sdata/dist-arch/install-setups.sh diff --git a/sdist/arch/outdate-detect-mode b/sdata/dist-arch/outdate-detect-mode similarity index 100% rename from sdist/arch/outdate-detect-mode rename to sdata/dist-arch/outdate-detect-mode diff --git a/sdist/arch/previous_dependencies.conf b/sdata/dist-arch/previous_dependencies.conf similarity index 100% rename from sdist/arch/previous_dependencies.conf rename to sdata/dist-arch/previous_dependencies.conf diff --git a/sdist/fallback/install-deps.sh b/sdata/dist-fallback/install-deps.sh similarity index 100% rename from sdist/fallback/install-deps.sh rename to sdata/dist-fallback/install-deps.sh diff --git a/sdist/fallback/install-setups.sh b/sdata/dist-fallback/install-setups.sh similarity index 100% rename from sdist/fallback/install-setups.sh rename to sdata/dist-fallback/install-setups.sh diff --git a/sdist/fallback/outdate-detect-mode b/sdata/dist-fallback/outdate-detect-mode similarity index 100% rename from sdist/fallback/outdate-detect-mode rename to sdata/dist-fallback/outdate-detect-mode diff --git a/sdist/gentoo/README.md b/sdata/dist-gentoo/README.md similarity index 88% rename from sdist/gentoo/README.md rename to sdata/dist-gentoo/README.md index 0678cc218..c488d50e8 100644 --- a/sdist/gentoo/README.md +++ b/sdata/dist-gentoo/README.md @@ -2,9 +2,9 @@ Note: - The scripts here are **not** meant to be executed directly. -- This folder should reflect the equivalents of `/sdist/arch/` but under Gentoo. - - **When `/sdist/arch/` is newer than this folder, an update on this folder is very likely needed.** - - Useful link: [Commit history on sdist/arch/](https://github.com/end-4/dots-hyprland/commits/main/sdist/arch) +- This folder should reflect the equivalents of `/sdata/dist-arch/` but under Gentoo. + - **When `/sdata/dist-arch/` is newer than this folder, an update on this folder is very likely needed.** + - Useful link: [Commit history on sdata/dist-arch/](https://github.com/end-4/dots-hyprland/commits/main/sdata/dist-arch) - See also [Install scripts | illogical-impulse](https://ii.clsty.link/en/dev/inst-script/) ## Contributors @@ -23,7 +23,7 @@ Note: 1. Creates the _i2c_ group since Gentoo doesn't have this by default, then adds the user to it. 2. Enables _bluetooth_ and _ydotool_ services (systemd or openrc) 3. _icons_, _konsole_, _hypr_, and _quickshell_ are are chowned to user since they're emerge in as root by default. -4. gsettings and kwriteconfig6 are set (same as sdist/arch). +4. gsettings and kwriteconfig6 are set (same as sdata/dist-arch). ## Recommended use flags (useflags) - **The recommended useflags are not required, this is a more out of the box experience with these** diff --git a/sdist/gentoo/additional-useflags b/sdata/dist-gentoo/additional-useflags similarity index 100% rename from sdist/gentoo/additional-useflags rename to sdata/dist-gentoo/additional-useflags diff --git a/sdist/gentoo/illogical-impulse-audio/illogical-impulse-audio-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-audio/illogical-impulse-audio-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-audio/illogical-impulse-audio-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-audio/illogical-impulse-audio-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-backlight/illogical-impulse-backlight-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-backlight/illogical-impulse-backlight-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-backlight/illogical-impulse-backlight-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-backlight/illogical-impulse-backlight-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-basic/illogical-impulse-basic-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-basic/illogical-impulse-basic-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-basic/illogical-impulse-basic-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-basic/illogical-impulse-basic-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-bibata-modern-classic-bin/illogical-impulse-bibata-modern-classic-bin-2.0.6-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-bibata-modern-classic-bin/illogical-impulse-bibata-modern-classic-bin-2.0.6-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-bibata-modern-classic-bin/illogical-impulse-bibata-modern-classic-bin-2.0.6-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-bibata-modern-classic-bin/illogical-impulse-bibata-modern-classic-bin-2.0.6-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-fonts-themes/illogical-impulse-fonts-themes-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-fonts-themes/illogical-impulse-fonts-themes-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-fonts-themes/illogical-impulse-fonts-themes-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-fonts-themes/illogical-impulse-fonts-themes-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-hyprland/hyprgraphics-9999.ebuild b/sdata/dist-gentoo/illogical-impulse-hyprland/hyprgraphics-9999.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-hyprland/hyprgraphics-9999.ebuild rename to sdata/dist-gentoo/illogical-impulse-hyprland/hyprgraphics-9999.ebuild diff --git a/sdist/gentoo/illogical-impulse-hyprland/hyprland-qt-support-9999.ebuild b/sdata/dist-gentoo/illogical-impulse-hyprland/hyprland-qt-support-9999.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-hyprland/hyprland-qt-support-9999.ebuild rename to sdata/dist-gentoo/illogical-impulse-hyprland/hyprland-qt-support-9999.ebuild diff --git a/sdist/gentoo/illogical-impulse-hyprland/hyprland-qtutils-9999.ebuild b/sdata/dist-gentoo/illogical-impulse-hyprland/hyprland-qtutils-9999.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-hyprland/hyprland-qtutils-9999.ebuild rename to sdata/dist-gentoo/illogical-impulse-hyprland/hyprland-qtutils-9999.ebuild diff --git a/sdist/gentoo/illogical-impulse-hyprland/hyprlang-9999.ebuild b/sdata/dist-gentoo/illogical-impulse-hyprland/hyprlang-9999.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-hyprland/hyprlang-9999.ebuild rename to sdata/dist-gentoo/illogical-impulse-hyprland/hyprlang-9999.ebuild diff --git a/sdist/gentoo/illogical-impulse-hyprland/hyprwayland-scanner-9999.ebuild b/sdata/dist-gentoo/illogical-impulse-hyprland/hyprwayland-scanner-9999.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-hyprland/hyprwayland-scanner-9999.ebuild rename to sdata/dist-gentoo/illogical-impulse-hyprland/hyprwayland-scanner-9999.ebuild diff --git a/sdist/gentoo/illogical-impulse-hyprland/illogical-impulse-hyprland-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-hyprland/illogical-impulse-hyprland-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-hyprland/illogical-impulse-hyprland-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-hyprland/illogical-impulse-hyprland-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-kde/illogical-impulse-kde-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-kde/illogical-impulse-kde-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-kde/illogical-impulse-kde-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-kde/illogical-impulse-kde-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-microtex-git/illogical-impulse-microtex-git-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-microtex-git/illogical-impulse-microtex-git-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-microtex-git/illogical-impulse-microtex-git-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-microtex-git/illogical-impulse-microtex-git-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-oneui4-icons-git/illogical-impulse-oneui4-icons-git-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-oneui4-icons-git/illogical-impulse-oneui4-icons-git-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-oneui4-icons-git/illogical-impulse-oneui4-icons-git-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-oneui4-icons-git/illogical-impulse-oneui4-icons-git-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-portal/illogical-impulse-portal-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-portal/illogical-impulse-portal-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-portal/illogical-impulse-portal-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-portal/illogical-impulse-portal-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-python/illogical-impulse-python-1.1-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-python/illogical-impulse-python-1.1-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-python/illogical-impulse-python-1.1-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-python/illogical-impulse-python-1.1-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r2.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r2.ebuild diff --git a/sdist/gentoo/illogical-impulse-screencapture/illogical-impulse-screencapture-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-screencapture/illogical-impulse-screencapture-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-screencapture/illogical-impulse-screencapture-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-screencapture/illogical-impulse-screencapture-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-toolkit/illogical-impulse-toolkit-1.0-r1.ebuild b/sdata/dist-gentoo/illogical-impulse-toolkit/illogical-impulse-toolkit-1.0-r1.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-toolkit/illogical-impulse-toolkit-1.0-r1.ebuild rename to sdata/dist-gentoo/illogical-impulse-toolkit/illogical-impulse-toolkit-1.0-r1.ebuild diff --git a/sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild b/sdata/dist-gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild similarity index 100% rename from sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild rename to sdata/dist-gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild diff --git a/sdist/gentoo/install-deps.sh b/sdata/dist-gentoo/install-deps.sh similarity index 74% rename from sdist/gentoo/install-deps.sh rename to sdata/dist-gentoo/install-deps.sh index 7be8f30a9..911512ddf 100644 --- a/sdist/gentoo/install-deps.sh +++ b/sdata/dist-gentoo/install-deps.sh @@ -18,7 +18,7 @@ printf "${STY_RST}" pause printf "${STY_YELLOW}" -printf "https://github.com/end-4/dots-hyprland/blob/main/sdist/gentoo/README.md" +printf "https://github.com/end-4/dots-hyprland/blob/main/sdata/dist-gentoo/README.md" printf "Checkout the above README for potential bug fixes or additional information" printf "${STY_RST}" pause @@ -42,13 +42,13 @@ metapkgs=(illogical-impulse-{audio,backlight,basic,bibata-modern-classic-bin,fon ebuild_dir="/var/db/repos/localrepo" # Unmasks -x sudo cp ./sdist/gentoo/keywords ./sdist/gentoo/keywords-user -x sed -i "s/$/ ~${arch}/" ./sdist/gentoo/keywords-user -v sudo cp ./sdist/gentoo/keywords-user /etc/portage/package.accept_keywords/illogical-impulse +x sudo cp ./sdata/dist-gentoo/keywords ./sdata/dist-gentoo/keywords-user +x sed -i "s/$/ ~${arch}/" ./sdata/dist-gentoo/keywords-user +v sudo cp ./sdata/dist-gentoo/keywords-user /etc/portage/package.accept_keywords/illogical-impulse # Use Flags -v sudo cp ./sdist/gentoo/useflags /etc/portage/package.use/illogical-impulse -v sudo sh -c 'cat ./sdist/gentoo/additional-useflags >> /etc/portage/package.use/illogical-impulse' +v sudo cp ./sdata/dist-gentoo/useflags /etc/portage/package.use/illogical-impulse +v sudo sh -c 'cat ./sdata/dist-gentoo/additional-useflags >> /etc/portage/package.use/illogical-impulse' # Update system v sudo emerge --sync @@ -67,11 +67,11 @@ x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprlang x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprlang x sudo mkdir -p ${ebuild_dir}/dev-util/hyprwayland-scanner -v sudo cp ./sdist/gentoo/${HYPR_DIR}/hyprgraphics*.ebuild ${ebuild_dir}/dev-libs/hyprgraphics -v sudo cp ./sdist/gentoo/${HYPR_DIR}/hyprland-qt-support*.ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support -v sudo cp ./sdist/gentoo/${HYPR_DIR}/hyprland-qtutils*.ebuild ${ebuild_dir}/gui-libs/hyprland-qtutils -v sudo cp ./sdist/gentoo/${HYPR_DIR}/hyprlang*.ebuild ${ebuild_dir}/dev-libs/hyprlang -v sudo cp ./sdist/gentoo/${HYPR_DIR}/hyprwayland-scanner*.ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner +v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprgraphics*.ebuild ${ebuild_dir}/dev-libs/hyprgraphics +v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprland-qt-support*.ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support +v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprland-qtutils*.ebuild ${ebuild_dir}/gui-libs/hyprland-qtutils +v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprlang*.ebuild ${ebuild_dir}/dev-libs/hyprlang +v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprwayland-scanner*.ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner v sudo ebuild ${ebuild_dir}/dev-libs/hyprgraphics/hyprgraphics*9999.ebuild digest v sudo ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support/hyprland-qt-support*9999.ebuild digest @@ -84,7 +84,7 @@ v sudo ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner/hyprwayland-scanner*999 # Install dependencies for i in "${metapkgs[@]}"; do x sudo mkdir -p ${ebuild_dir}/app-misc/${i} - v sudo cp ./sdist/gentoo/${i}/${i}*.ebuild ${ebuild_dir}/app-misc/${i}/ + v sudo cp ./sdata/dist-gentoo/${i}/${i}*.ebuild ${ebuild_dir}/app-misc/${i}/ v sudo ebuild ${ebuild_dir}/app-misc/${i}/*.ebuild digest v sudo emerge --quiet app-misc/${i} done diff --git a/sdist/gentoo/install-setups.sh b/sdata/dist-gentoo/install-setups.sh similarity index 100% rename from sdist/gentoo/install-setups.sh rename to sdata/dist-gentoo/install-setups.sh diff --git a/sdist/gentoo/keywords b/sdata/dist-gentoo/keywords similarity index 100% rename from sdist/gentoo/keywords rename to sdata/dist-gentoo/keywords diff --git a/sdist/gentoo/outdate-detect-mode b/sdata/dist-gentoo/outdate-detect-mode similarity index 100% rename from sdist/gentoo/outdate-detect-mode rename to sdata/dist-gentoo/outdate-detect-mode diff --git a/sdist/gentoo/useflags b/sdata/dist-gentoo/useflags similarity index 100% rename from sdist/gentoo/useflags rename to sdata/dist-gentoo/useflags diff --git a/sdist/nix/README.md b/sdata/dist-nix/README.md similarity index 93% rename from sdist/nix/README.md rename to sdata/dist-nix/README.md index 502e44df9..458556d72 100644 --- a/sdist/nix/README.md +++ b/sdata/dist-nix/README.md @@ -3,11 +3,11 @@ - See also [Install scripts | illogical-impulse](https://ii.clsty.link/en/dev/inst-script/) - See also [#1061](https://github.com/end-4/dots-hyprland/issues/1061) -**NOTE: The sdist/nix is not for NixOS but every distro, using Nix and home-manager.** +**NOTE: The sdata/dist-nix is not for NixOS but every distro, using Nix and home-manager.** ## plan TODO: -Write a proper `flake.nix` and optionally `home.nix` and other files under `./sdist/nix/iiqs-hm/` to install all dependencies that `./sdist/arch/install-deps.sh` does. (**excluding** the screenlock) +Write a proper `flake.nix` and optionally `home.nix` and other files under `./sdata/dist-nix/iiqs-hm/` to install all dependencies that `./sdata/dist-arch/install-deps.sh` does. (**excluding** the screenlock) TODO: In this script, implement the process below: diff --git a/sdist/nix/install-deps.sh b/sdata/dist-nix/install-deps.sh similarity index 100% rename from sdist/nix/install-deps.sh rename to sdata/dist-nix/install-deps.sh diff --git a/sdist/nix/outdate-detect-mode b/sdata/dist-nix/outdate-detect-mode similarity index 100% rename from sdist/nix/outdate-detect-mode rename to sdata/dist-nix/outdate-detect-mode diff --git a/sdata/step/1.install-deps-selector.sh b/sdata/step/1.install-deps-selector.sh index c869ff870..c1f4bea0c 100644 --- a/sdata/step/1.install-deps-selector.sh +++ b/sdata/step/1.install-deps-selector.sh @@ -76,13 +76,13 @@ if [[ "$INSTALL_VIA_NIX" == "true" ]]; then TARGET_ID=nix printf "${STY_YELLOW}" printf "===WARNING===\n" - printf "./sdist/${TARGET_ID}/install-deps.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-deps.sh will be used.\n" printf "The process is still WIP.\n" printf "Proceed only at your own risk.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-deps.sh + source ./sdata/dist-${TARGET_ID}/install-deps.sh elif [[ "$OS_DISTRO_ID" =~ ^(arch|endeavouros)$ ]]; then @@ -90,23 +90,23 @@ elif [[ "$OS_DISTRO_ID" =~ ^(arch|endeavouros)$ ]]; then printf "${STY_GREEN}" printf "===INFO===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" - printf "./sdist/${TARGET_ID}/install-deps.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-deps.sh will be used.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-deps.sh + source ./sdata/dist-${TARGET_ID}/install-deps.sh -elif [[ -f "./sdist/${OS_DISTRO_ID}/install-deps.sh" ]]; then +elif [[ -f "./sdata/dist-${OS_DISTRO_ID}/install-deps.sh" ]]; then TARGET_ID=${OS_DISTRO_ID} printf "${STY_PURPLE}" printf "===NOTICE===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" - printf "./sdist/${TARGET_ID}/install-deps.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-deps.sh will be used.\n" printf "This file is provided by the community.\n" printf "It is not officially supported by github:end-4/dots-hyprland .\n" - test -f "./sdist/${TARGET_ID}/README.md" && \ - printf "Read ${STY_INVERT} ./sdist/${TARGET_ID}/README.md ${STY_RST}${STY_PURPLE} for more information.\n" + test -f "./sdata/dist-${TARGET_ID}/README.md" && \ + printf "Read ${STY_INVERT} ./sdata/dist-${TARGET_ID}/README.md ${STY_RST}${STY_PURPLE} for more information.\n" printf "${STY_BOLD}" printf "If you find out any problems about it, PR is welcomed if you are able to address it. Or, create a discussion about it, but please do not submit issue, because the developers do not use this distro, therefore they cannot help.${STY_RST}\n" printf "${STY_PURPLE}" @@ -114,13 +114,13 @@ elif [[ -f "./sdist/${OS_DISTRO_ID}/install-deps.sh" ]]; then printf "\n" printf "${STY_RST}" pause - tmp_update_status="$(outdate_detect sdist/arch sdist/${TARGET_ID})" + tmp_update_status="$(outdate_detect sdata/dist-arch sdata/dist-${TARGET_ID})" if [[ "${tmp_update_status}" =~ ^(OUTDATED|EMPTY_TARGET|EMPTY_SOURCE|FORCE_OUTDATED|WIP)$ ]]; then printf "${STY_RED}${STY_BOLD}===URGENT===${STY_RST}\n" printf "${STY_RED}" - printf "The community provided ./sdist/${TARGET_ID}/ is not updated (update status: ${tmp_update_status}),\n" - printf "which means it does not fully reflect the latest changes of ./sdist/arch/ .\n" - printf "You are highly recommended to abort this script, until someone (maybe you?) has updated the ./sdist/${TARGET_ID}/ to fully reflect the latest changes in ./sdist/arch/ .\n" + printf "The community provided ./sdata/dist-${TARGET_ID}/ is not updated (update status: ${tmp_update_status}),\n" + printf "which means it does not fully reflect the latest changes of ./sdata/dist-arch/ .\n" + printf "You are highly recommended to abort this script, until someone (maybe you?) has updated the ./sdata/dist-${TARGET_ID}/ to fully reflect the latest changes in ./sdata/dist-arch/ .\n" printf "PR is welcomed. Please see discussion#2140 for details.\n" printf "${STY_UNDERLINE}https://github.com/end-4/dots-hyprland/discussions/2140${STY_RST}\n" printf "${STY_RED}${STY_INVERT}If you are proceeding anyway, illogical-impulse will very likely not work as expected.${STY_RST}\n" @@ -134,7 +134,7 @@ elif [[ -f "./sdist/${OS_DISTRO_ID}/install-deps.sh" ]]; then *)echo "Aborting...";exit 1;; esac fi - source ./sdist/${TARGET_ID}/install-deps.sh + source ./sdata/dist-${TARGET_ID}/install-deps.sh elif [[ "$OS_DISTRO_ID_LIKE" == "arch" || "$OS_DISTRO_ID" == "cachyos" ]]; then @@ -143,14 +143,14 @@ elif [[ "$OS_DISTRO_ID_LIKE" == "arch" || "$OS_DISTRO_ID" == "cachyos" ]]; then printf "===WARNING===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" printf "Detected distro ID_LIKE: ${OS_DISTRO_ID_LIKE}\n" - printf "./sdist/${TARGET_ID}/install-deps.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-deps.sh will be used.\n" printf "Ideally, it should also work for your distro.\n" printf "Still, there is a chance that it not works as expected or even fails.\n" printf "Proceed only at your own risk.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-deps.sh + source ./sdata/dist-${TARGET_ID}/install-deps.sh else @@ -159,13 +159,13 @@ else printf "${STY_RED}" printf "Detected distro ID: ${OS_DISTRO_ID}\n" printf "Detected distro ID_LIKE: ${OS_DISTRO_ID_LIKE}\n" - printf "./sdist/${OS_DISTRO_ID}/install-deps.sh not found.\n" - printf "./sdist/${TARGET_ID}/install-deps.sh will be used.\n" + printf "./sdata/dist-${OS_DISTRO_ID}/install-deps.sh not found.\n" + printf "./sdata/dist-${TARGET_ID}/install-deps.sh will be used.\n" printf "1. It may disrupt your system and will likely fail without your manual intervention.\n" printf "2. It's WIP and only contains small number of dependencies far from enough.\n" printf "Proceed only at your own risk.\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-deps.sh + source ./sdata/dist-${TARGET_ID}/install-deps.sh fi diff --git a/sdata/step/2.install-setups-selector.sh b/sdata/step/2.install-setups-selector.sh index 92c67d40a..c279d7085 100644 --- a/sdata/step/2.install-setups-selector.sh +++ b/sdata/step/2.install-setups-selector.sh @@ -21,13 +21,13 @@ if [[ "$INSTALL_VIA_NIX" == "true" ]]; then TARGET_ID=fallback printf "${STY_YELLOW}" printf "===WARNING===\n" - printf "./sdist/${TARGET_ID}/install-setups.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-setups.sh will be used.\n" printf "The process is still WIP.\n" printf "Proceed only at your own risk.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-setups.sh + source ./sdata/dist-${TARGET_ID}/install-setups.sh elif [[ "$OS_DISTRO_ID" == "arch" ]]; then @@ -35,19 +35,19 @@ elif [[ "$OS_DISTRO_ID" == "arch" ]]; then printf "${STY_GREEN}" printf "===INFO===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" - printf "./sdist/${TARGET_ID}/install-setups.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-setups.sh will be used.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-setups.sh + source ./sdata/dist-${TARGET_ID}/install-setups.sh -elif [[ -f "./sdist/${OS_DISTRO_ID}/install-setups.sh" ]]; then +elif [[ -f "./sdata/dist-${OS_DISTRO_ID}/install-setups.sh" ]]; then TARGET_ID=${OS_DISTRO_ID} printf "${STY_PURPLE}" printf "===NOTICE===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" - printf "./sdist/${TARGET_ID}/install-setups.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-setups.sh will be used.\n" printf "This file is provided by the community.\n" printf "It is not officially supported by github:end-4/dots-hyprland .\n" printf "${STY_INVERT}" @@ -57,7 +57,7 @@ elif [[ -f "./sdist/${OS_DISTRO_ID}/install-setups.sh" ]]; then printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-setups.sh + source ./sdata/dist-${TARGET_ID}/install-setups.sh elif [[ "$OS_DISTRO_ID_LIKE" == "arch" || "$OS_DISTRO_ID" == "cachyos" ]]; then @@ -66,14 +66,14 @@ elif [[ "$OS_DISTRO_ID_LIKE" == "arch" || "$OS_DISTRO_ID" == "cachyos" ]]; then printf "===WARNING===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" printf "Detected distro ID_LIKE: ${OS_DISTRO_ID_LIKE}\n" - printf "./sdist/${TARGET_ID}/install-setups.sh will be used.\n" + printf "./sdata/dist-${TARGET_ID}/install-setups.sh will be used.\n" printf "Ideally, it should also work for your distro.\n" printf "Still, there is a chance that it not works as expected or even fails.\n" printf "Proceed only at your own risk.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-setups.sh + source ./sdata/dist-${TARGET_ID}/install-setups.sh else @@ -82,13 +82,13 @@ else printf "===WARNING===\n" printf "Detected distro ID: ${OS_DISTRO_ID}\n" printf "Detected distro ID_LIKE: ${OS_DISTRO_ID_LIKE}\n" - printf "./sdist/${OS_DISTRO_ID}/install-setups.sh not found.\n" - printf "./sdist/${TARGET_ID}/install-setups.sh will be used.\n" + printf "./sdata/dist-${OS_DISTRO_ID}/install-setups.sh not found.\n" + printf "./sdata/dist-${TARGET_ID}/install-setups.sh will be used.\n" printf "It might fail or disrupt your system.\n" printf "Proceed only at your own risk.\n" printf "\n" printf "${STY_RST}" pause - source ./sdist/${TARGET_ID}/install-setups.sh + source ./sdata/dist-${TARGET_ID}/install-setups.sh fi diff --git a/sdata/step/exp-update-old.sh b/sdata/step/exp-update-old.sh index 61ce27920..76ddd9ed9 100644 --- a/sdata/step/exp-update-old.sh +++ b/sdata/step/exp-update-old.sh @@ -17,7 +17,7 @@ set -uo pipefail # === Configuration === DOTS_ROOT="${REPO_ROOT}/dots" -ARCH_PACKAGES_DIR="${REPO_ROOT}/sdist/arch" +ARCH_PACKAGES_DIR="${REPO_ROOT}/sdata/dist-arch" UPDATE_IGNORE_FILE="${REPO_ROOT}/.updateignore" HOME_UPDATE_IGNORE_FILE="${HOME}/.updateignore" @@ -303,7 +303,7 @@ list_packages() { local changed_packages=() if [[ ! -d "$ARCH_PACKAGES_DIR" ]]; then - log_warning "No sdist/arch directory found" + log_warning "No sdata/dist-arch directory found" return 1 fi @@ -319,7 +319,7 @@ list_packages() { done if [[ ${#available_packages[@]} -eq 0 ]]; then - log_info "No packages found in sdist/arch directory" + log_info "No packages found in sdata/dist-arch directory" return 1 fi @@ -557,7 +557,7 @@ if [[ "$CHECK_PACKAGES" == true ]]; then log_header "Package Management" if [[ ! -d "$ARCH_PACKAGES_DIR" ]]; then - log_warning "No sdist/arch directory found. Skipping package management." + log_warning "No sdata/dist-arch directory found. Skipping package management." else # Check if any PKGBUILDs have changed changed_pkgbuilds=() diff --git a/sdata/step/exp-update-tester.sh b/sdata/step/exp-update-tester.sh index 06d6392d6..9b467d7a1 100755 --- a/sdata/step/exp-update-tester.sh +++ b/sdata/step/exp-update-tester.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# exp-update-tester.sh - Test suite for update.sh (sourced subcommand) +# exp-update-tester.sh - Test suite for exp-update.sh # set -euo pipefail diff --git a/sdata/step/exp-update.sh b/sdata/step/exp-update.sh index 369e380ff..32d90ebec 100644 --- a/sdata/step/exp-update.sh +++ b/sdata/step/exp-update.sh @@ -30,8 +30,8 @@ if which pacman &>/dev/null; then ARCH_PACKAGES_DIR="${REPO_ROOT}/dist-arch" elif [[ -d "${REPO_ROOT}/arch-packages" ]]; then ARCH_PACKAGES_DIR="${REPO_ROOT}/arch-packages" - elif [[ -d "${REPO_ROOT}/sdist/arch" ]]; then - ARCH_PACKAGES_DIR="${REPO_ROOT}/sdist/arch" + elif [[ -d "${REPO_ROOT}/sdata/dist-arch" ]]; then + ARCH_PACKAGES_DIR="${REPO_ROOT}/sdata/dist-arch" else ARCH_PACKAGES_DIR="${REPO_ROOT}/dist-arch" # Default fallback fi @@ -868,7 +868,7 @@ if [[ "$CHECK_PACKAGES" == true ]]; then if [[ "$PKG_TOOLS_AVAILABLE" == true ]]; then if [[ ! -d "$ARCH_PACKAGES_DIR" ]]; then - log_warning "No packages directory found (tried: dist-arch, arch-packages, sdist/arch). Skipping package management." + log_warning "No packages directory found (tried: dist-arch, arch-packages, sdata/dist-arch). Skipping package management." else changed_pkgbuilds=() for pkg_dir in "$ARCH_PACKAGES_DIR"/*/; do diff --git a/sdist/README.md b/sdist/README.md deleted file mode 100644 index dd55957fa..000000000 --- a/sdist/README.md +++ /dev/null @@ -1 +0,0 @@ -This folder contains data specific to every distro for install scripts.