kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

Move sdist/ID to sdata/dist-ID

Browse Source
This commit is contained in:
clsty
2025-10-26 21:27:41 +08:00
parent c13ba5f25e
commit 5a846cdec5
66 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdata/step/1.install-deps-selector.sh
+18 -18
View File
@@ -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
sdata/step/2.install-setups-selector.sh
+12 -12
View File
@@ -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
sdata/step/exp-update-old.sh
+4 -4
View File
@@ -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=()
sdata/step/exp-update-tester.sh
+1 -1
View File
@@ -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
sdata/step/exp-update.sh
+3 -3
View File
@@ -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