Compare commits

..

3 Commits

Author SHA1 Message Date
T. R. Bernstein
1e1ea39a90 Use HOME env variable in brew caller scripts 2025-10-20 14:02:31 +02:00
T. R. Bernstein
cd8f2b7c0d Fix missing function in setup-user script
Add missing getDefaultGitHomebrewURL.
2025-10-20 14:02:31 +02:00
T. R. Bernstein
48fe726f31 Make sudo-settings module executable 2025-10-20 14:02:31 +02:00
2 changed files with 15 additions and 3 deletions

View File

@@ -55,9 +55,17 @@ function downloadHomebrew() {
popd -q popd -q
} }
function getCanonicalBrewPath() {
local brewPath=${homebrew_directory}/bin/brew
if [[ $brewPath == $HOME* ]]; then
brewPath="\${HOME}${brewPath#$HOME}"
fi
echo $brewPath
}
function createBrewCallerScript() { function createBrewCallerScript() {
local cmdPath=${HOME}/bin/brew local cmdPath=${HOME}/bin/brew
local brewPath=${homebrew_directory}/bin/brew local brewPath=`getCanonicalBrewPath`
[[ -f ${cmdPath} ]] && rm ${cmdPath} [[ -f ${cmdPath} ]] && rm ${cmdPath}
mkdir -p ${cmdPath:h} mkdir -p ${cmdPath:h}
cat <<- BREWCALLER > ${cmdPath} cat <<- BREWCALLER > ${cmdPath}
@@ -74,13 +82,13 @@ function createBrewCallerScript() {
} }
function createBrewPeriodicScript() { function createBrewPeriodicScript() {
local brewCallerPath=${HOME}/bin/brew local brewPath=`getCanonicalBrewPath`
local cmdPath=${HOME}/bin/brew-periodic local cmdPath=${HOME}/bin/brew-periodic
[[ -f ${cmdPath} ]] && rm ${cmdPath} [[ -f ${cmdPath} ]] && rm ${cmdPath}
mkdir -p ${cmdPath:h} mkdir -p ${cmdPath:h}
cat <<- BREWCALLER > ${cmdPath} cat <<- BREWCALLER > ${cmdPath}
#!/usr/bin/env zsh #!/usr/bin/env zsh
local brew='${brewCallerPath}' local brew='${brewPath}'
\$brew update \$brew update
\$brew upgrade --greedy \$brew upgrade --greedy
\$brew cleanup \$brew cleanup
@@ -138,6 +146,10 @@ function getHomebrewDirectoryPath() {
print -- ${homebrew_prefix:-$(getDefaultHomebrewPrefix)}/Homebrew print -- ${homebrew_prefix:-$(getDefaultHomebrewPrefix)}/Homebrew
} }
function getDefaultGitHomebrewURL() {
print -- ${HOMEBREW_BREW_GIT_REMOTE:-https://github.com/Homebrew/brew.git}
}
function configureFolders() { function configureFolders() {
local dirPath local dirPath
for dirPath in ${HOME}/bin ${HOME}/.vim/{backups,swaps}; do for dirPath in ${HOME}/bin ${HOME}/.vim/{backups,swaps}; do

0
modules/00a-sudo-settings.sh Normal file → Executable file
View File