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

Enhance the logic for pass the args to update script

Browse Source
This commit is contained in:
Bishoy Ehab
2025-10-17 13:54:02 +03:00
parent 528ae04711
commit 12011fd0c8
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+3 -3
View File
@@ -27,14 +27,14 @@ if [[ "${EXPERIMENTAL_UPDATE_SCRIPT}" = true ]]; then
for arg in "${ORIGINAL_ARGS[@]}"; do for arg in "${ORIGINAL_ARGS[@]}"; do
case "$arg" in case "$arg" in
--exp-update|--force|-f|--clean|-c|--skip-allgreeting|--skip-alldeps|--skip-allsetups|--skip-allfiles|--skip-sysupdate|-s|--skip-hyprland|--skip-fish|--skip-miscconf|--skip-plasmaintg|--exp-files|--via-nix|--fontset) --exp-update|--force|-f|--clean|-c|--skip-allgreeting|--skip-alldeps|--skip-allsetups|--skip-allfiles|--skip-sysupdate|-s|--skip-hyprland|--skip-fish|--skip-miscconf|--skip-plasmaintg|--exp-files|--via-nix|--fontset)
# These are install script args, skip them ;;
-u|--update-force|-p|--packages|-n|--dry-run|-v|--verbose|--skip-notice)
UPDATE_ARGS+=("$arg")
;; ;;
*) *)
UPDATE_ARGS+=("$arg")
;; ;;
esac esac
done done
# Execute update.sh with update-specific arguments
bash ./sdata/exp/update.sh "${UPDATE_ARGS[@]}" bash ./sdata/exp/update.sh "${UPDATE_ARGS[@]}"
exit exit
fi fi
sdata/lib/options.sh
+17 -5
View File
@@ -16,7 +16,6 @@ If no option is specified, run default install process.
--skip-alldeps Skip the whole process installing dependency --skip-alldeps Skip the whole process installing dependency
--skip-allsetups Skip the whole process setting up permissions/services etc --skip-allsetups Skip the whole process setting up permissions/services etc
--skip-allfiles Skip the whole process copying configuration files --skip-allfiles Skip the whole process copying configuration files
--skip-notice Skip warning notice (for experimental scripts)
-s, --skip-sysupdate Skip system package upgrade e.g. \"sudo pacman -Syu\" -s, --skip-sysupdate Skip system package upgrade e.g. \"sudo pacman -Syu\"
--skip-hyprland Skip installing the config for Hyprland --skip-hyprland Skip installing the config for Hyprland
--skip-fish Skip installing the config for Fish --skip-fish Skip installing the config for Fish
@@ -28,6 +27,13 @@ If no option is specified, run default install process.
--via-nix (Unavailable yet) Use Nix to install dependencies --via-nix (Unavailable yet) Use Nix to install dependencies
--exp-uninstall Use experimental uninstall script --exp-uninstall Use experimental uninstall script
--exp-update Use experimental update script --exp-update Use experimental update script
Update Script Options (only with --exp-update):
-u, --update-force Force check all files even if no new commits (update script)
-p, --packages Enable package checking and building (update script)
-n, --dry-run Show what would be done without making changes (update script)
-v, --verbose Enable verbose output (update script)
--skip-notice Skip warning notice (for experimental scripts)
" "
} }
@@ -37,8 +43,8 @@ cleancache(){
# `man getopt` to see more # `man getopt` to see more
para=$(getopt \ para=$(getopt \
-o hfk:cs \ -o hfk:csu:p:n:v \
-l help,force,fontset:,clean,skip-allgreeting,skip-alldeps,skip-allsetups,skip-allfiles,skip-notice,skip-sysupdate,skip-fish,skip-hyprland,skip-plasmaintg,skip-miscconf,exp-files,via-nix,exp-uninstall,exp-update \ -l help,force,fontset:,clean,skip-allgreeting,skip-alldeps,skip-allsetups,skip-allfiles,skip-sysupdate,skip-fish,skip-hyprland,skip-plasmaintg,skip-miscconf,exp-files,via-nix,exp-uninstall,exp-update,update-force,packages,dry-run,verbose,skip-notice \
-n "$0" -- "$@") -n "$0" -- "$@")
[ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1 [ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1
##################################################################################### #####################################################################################
@@ -67,7 +73,6 @@ while true ; do
--skip-alldeps) SKIP_ALLDEPS=true;shift;; --skip-alldeps) SKIP_ALLDEPS=true;shift;;
--skip-allsetups) SKIP_ALLSETUPS=true;shift;; --skip-allsetups) SKIP_ALLSETUPS=true;shift;;
--skip-allfiles) SKIP_ALLFILES=true;shift;; --skip-allfiles) SKIP_ALLFILES=true;shift;;
--skip-notice) SKIP_NOTICE=true;shift;;
-s|--skip-sysupdate) SKIP_SYSUPDATE=true;shift;; -s|--skip-sysupdate) SKIP_SYSUPDATE=true;shift;;
--skip-hyprland) SKIP_HYPRLAND=true;shift;; --skip-hyprland) SKIP_HYPRLAND=true;shift;;
--skip-fish) SKIP_FISH=true;shift;; --skip-fish) SKIP_FISH=true;shift;;
@@ -77,8 +82,15 @@ while true ; do
--via-nix) INSTALL_VIA_NIX=true;shift;; --via-nix) INSTALL_VIA_NIX=true;shift;;
--exp-uninstall) EXPERIMENTAL_UNINSTALL_SCRIPT=true;shift;; --exp-uninstall) EXPERIMENTAL_UNINSTALL_SCRIPT=true;shift;;
--exp-update) EXPERIMENTAL_UPDATE_SCRIPT=true;shift;; --exp-update) EXPERIMENTAL_UPDATE_SCRIPT=true;shift;;
## Ones with parameter
## Update script specific options
-u|--update-force) UPDATE_FORCE=true;shift;;
-p|--packages) UPDATE_PACKAGES=true;shift;;
-n|--dry-run) UPDATE_DRY_RUN=true;shift;;
-v|--verbose) UPDATE_VERBOSE=true;shift;;
--skip-notice) SKIP_NOTICE=true;shift;;
## Ones with parameter
--fontset) --fontset)
case $2 in case $2 in
"default"|"zh-CN"|"vi") fontset="$2";; "default"|"zh-CN"|"vi") fontset="$2";;