@@ -61,28 +61,31 @@ main() {
61
61
62
62
# GIT_ASKPASS lets us use the password when pushing without revealing it in the process list
63
63
# See: https://serverfault.com/a/912788
64
- GIT_ASKPASS =" $HOME /git-askpass.sh"
64
+ PATH_TO_GIT_ASKPASS =" $HOME /git-askpass.sh"
65
65
# Source: https://serverfault.com/a/912788
66
66
# shellcheck disable=SC2016,SC2028
67
- echo ' #!/bin/sh\nexec echo " $HOMEBREW_GITHUB_API_TOKEN" ' > " $GIT_ASKPASS "
67
+ echo ' echo $HOMEBREW_GITHUB_API_TOKEN' > " $PATH_TO_ASKPASS "
68
68
69
69
# Make sure the git-askpass.sh file creation is successful
70
- if [[ $( file_exists " git-askpass.sh " ) -eq 1 ]]; then
70
+ if [[ $( file_exists " $PATH_TO_GIT_ASKPASS " ) -eq 1 ]]; then
71
71
echo " git-askpass.sh not found in $HOME ."
72
72
ls -la " $HOME "
73
73
exit 1
74
74
fi
75
75
76
76
# Ensure it's executable since we just created it
77
- chmod +x " $GIT_ASKPASS "
77
+ chmod +x " $PATH_TO_GIT_ASKPASS "
78
78
79
79
# Make sure the git-askpass.sh file is executable
80
- if [[ $( is_executable " $GIT_ASKPASS " ) -eq 1 ]]; then
81
- echo " git-askpass.sh is not executable."
82
- ls -la " $GIT_ASKPASS "
80
+ if [[ $( is_executable " $PATH_TO_GIT_ASKPASS " ) -eq 1 ]]; then
81
+ echo " $PATH_TO_GIT_ASKPASS is not executable."
82
+ ls -la " $PATH_TO_GIT_ASKPASS "
83
83
exit 1
84
84
fi
85
85
86
+ # Export the variables so git sees them
87
+ export HOMEBREW_GITHUB_API_TOKEN=" $HOMEBREW_GITHUB_API_TOKEN "
88
+ export GIT_ASKPASS=" $PATH_TO_ASKPASS "
86
89
git push https://
[email protected] /cdr-oss/homebrew-core.git --all
87
90
88
91
# Find the docs for bump-formula-pr here
@@ -101,7 +104,11 @@ main() {
101
104
cd ..
102
105
rm -rf homebrew-core
103
106
104
- # TODO@jsjoeio - check that homebrew-core was removed
107
+ # Make sure homebrew-core is removed
108
+ if [[ $( directory_exists " homebrew-core" ) -eq 0 ]]; then
109
+ echo " rm -rf homebrew-core failed."
110
+ ls -la
111
+ fi
105
112
}
106
113
107
114
main " $@ "
0 commit comments