Merge branch 'main' into ci-macos

Author: JavierCane

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         os:
           - macos-26
-          - ubuntu-20.04
+          - 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"

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
 }