Merge branch 'main_upstream'

* main_upstream:
  style: fix linter
  feat: add support for 'asdf' sdk manager (CodelyTV#240)
  fix(npm): remove sudo from npm install command in update_all function (CodelyTV#277)
  ci: upgrade macos version (CodelyTV#279)
  ci: upgrade Ubuntu version (CodelyTV#278)
  feat: ensure default branch name for dotfiles repository (CodelyTV#242)
  fix: correct find -perm option for macos (CodelyTV#272)
  fix: restore script with -c option leads to infinite loop (CodelyTV#243)

# Conflicts:
#	scripts/package/dump
#	scripts/package/import
#	scripts/package/src/dump.sh

Author: aalbiach

.github/workflows/ci.yml

@@ -13,8 +13,8 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-12
-          - ubuntu-20.04
+          - macos-26
+          - ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2

installer

@@ -71,6 +71,8 @@ DOTFILES_PATH="${DOTFILES_PATH:-$HOME/.dotfiles}"
 DOTFILES_PATH="$(eval echo "$DOTFILES_PATH")"
 export DOTFILES_PATH="$DOTFILES_PATH"
 
+DOTFILES_BRANCH=${DOTFILES_BRANCH:-main}
+
 dotly_inner_path="modules/dotly"
 export DOTLY_PATH="$DOTFILES_PATH/$dotly_inner_path"
 
@@ -140,7 +142,7 @@ if ! command_exists curl; then
 fi
 
 _a "Initializing your dotfiles git repository"
-git init 2>&1 | _log "Initializing repository"
+git init --initial-branch="$DOTFILES_BRANCH" 2>&1 | _log "Initializing repository"
 
 _a "Cloning dotly"
 git submodule add -b "$DOTLY_BRANCH" "https://github.com/$DOTLY_REPOSITORY.git" "$dotly_inner_path" 2>&1 | _log "Adding dotly submodule"

restorer

@@ -45,6 +45,7 @@ EOF
 		;;
 	--continue | -c)
 		continue=true
+		break
 		;;
 	*) ;;
 

scripts/core/dot.sh

@@ -25,8 +25,13 @@ dot::list_scripts() {
 }
 
 dot::list_scripts_path() {
-	dotly_contexts=$(find "$DOTLY_PATH/scripts" -maxdepth 2 -perm /+111 -type f | grep -v "$DOTLY_PATH/scripts/core")
-	dotfiles_contexts=$(find "$DOTFILES_PATH/scripts" -maxdepth 2 -perm /+111 -type f)
+	if platform::is_macos; then
+		dotly_contexts=$(find "$DOTLY_PATH/scripts" -maxdepth 2 -perm -111 -type f | grep -v "$DOTLY_PATH/scripts/core")
+		dotfiles_contexts=$(find "$DOTFILES_PATH/scripts" -maxdepth 2 -perm -111 -type f)
+	else
+		dotly_contexts=$(find "$DOTLY_PATH/scripts" -maxdepth 2 -perm /+111 -type f | grep -v "$DOTLY_PATH/scripts/core")
+		dotfiles_contexts=$(find "$DOTFILES_PATH/scripts" -maxdepth 2 -perm /+111 -type f)
+	fi
 
 	printf "%s\n%s" "$dotly_contexts" "$dotfiles_contexts" | sort -u
 }

scripts/package/dump

@@ -11,6 +11,7 @@ source "$DOTLY_PATH/scripts/package/src/dump.sh"
 ##?  * Python
 ##?  * Volta.sh or NPM
 ##?  * Winget
+##?  * asdf
 ##?
 ##? Usage:
 ##?   dump
@@ -34,6 +35,8 @@ fi
 
 platform::command_exists winget.exe && package::winget_dump && output::answer "Windows apps dumped on $WINGET_DUMP_FILE_PATH"
 
+platform::command_exists asdf && package::asdf_dump && output::answer "asdf SDKs dumped on $ASDF_DUMP_FILE_PATH"
+
 platform::command_exists sdk && package::sdkman_dump && output::answer "SDKMAN candidates dumped on $SDKMAN_DUMP_FILE_PATH"
 
 output::write 'All packages dumped'

scripts/package/import

@@ -32,6 +32,8 @@ fi
 
 platform::command_exists winget.exe && output::header "Importing Winget apps from $WINGET_DUMP_FILE_PATH" && package::winget_import
 
+platform::command_exists asdf && output::header "Importing Asdf apps from $ASDF_DUMP_FILE_PATH" && package::asdf_import
+
 platform::command_exists sdk && output::header "Importing SDKMAN candidates from $SDKMAN_DUMP_FILE_PATH" && package::sdkman_import
 
 output::solution 'All packages imported'

scripts/package/src/dump.sh

@@ -14,6 +14,7 @@ PYTHON_DUMP_FILE_PATH="$DOTFILES_PATH/langs/python/requirements.txt"
 SNAP_DUMP_FILE_PATH="$DOTFILES_PATH/os/linux/snap/packages.txt"
 VOLTA_DUMP_FILE_PATH="$DOTFILES_PATH/langs/js/volta_dependencies.txt"
 WINGET_DUMP_FILE_PATH="$DOTFILES_PATH/os/windows/winget.output"
+ASDF_DUMP_FILE_PATH="$DOTFILES_PATH/langs/sdk/asdf.txt"
 SDKMAN_DUMP_FILE_PATH="$DOTFILES_PATH/os/mac/sdk/candidates.txt"
 
 package::brew_dump() {
@@ -126,6 +127,40 @@ package::pacman_import() {
 	fi
 }
 
+package::asdf_dump() {
+	mkdir -p "$DOTFILES_PATH/langs/sdk"
+	echo -n >$ASDF_DUMP_FILE_PATH
+
+	for plug in $(asdf plugin-list); do
+		for ver in $(asdf list $plug | awk '{print $1; }'); do
+			if [ -z "$ver" ]; then
+				echo "No versions installed for $plug"
+			else
+				echo "$plug $ver" >>$ASDF_DUMP_FILE_PATH
+			fi
+		done
+	done
+}
+
+package::asdf_import() {
+	if [ -f "$ASDF_DUMP_FILE_PATH" ]; then
+		for plug in $(cat $ASDF_DUMP_FILE_PATH | awk '{ print $1 }' | uniq); do
+			echo "asdf plugin-add $plug"
+		done
+		while read -r line; do
+			plug=$(echo $line | awk '{print $1; }')
+			ver=$(echo $line | awk '{print $2; }')
+			if [[ $ver == \** ]]; then
+				ver=${ver:1}
+				echo "asdf install $plug $ver"
+				echo "asdf global $plug $ver"
+			else
+				echo "asdf install $plug $ver"
+			fi
+		done <$ASDF_DUMP_FILE_PATH
+	fi
+}
+
 package::sdkman_dump() {
   mkdir -p "$DOTFILES_PATH/os/mac/sdk"
 

scripts/package/src/package_managers/npm.sh

@@ -17,7 +17,7 @@ npm::update_all() {
 			output::write "└ $url"
 			output::empty_line
 
-			sudo npm install --location=global "$package" 2>&1 | log::file "Updating npm app: $package"
+			npm install --location=global "$package" 2>&1 | log::file "Updating npm app: $package"
 		done
 	else
 		output::answer "Already up-to-date"