psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-26 09:15:34 -05:00
Code Issues Releases Wiki Activity

Do git clone with core.autocrlf=false

Browse source 
to override any `core.autocrlf=true` the user could have set globally.
Fixes #404
This commit is contained in:
Eric Nielsen 2021-08-09 20:32:32 -05:00
parent 6700933262
commit f6b623f515
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tools/degit.zsh.erb
View file

@ -7,7 +7,7 @@ print_error() {
print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b ${1}%f"${2:+$'\n'${(F):- ${(f)^2}}} print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b ${1}%f"${2:+$'\n'${(F):- ${(f)^2}}}
} }
print_done() { print_okay() {
if [[ -e ${DIR}/.gitmodules ]]; then if [[ -e ${DIR}/.gitmodules ]]; then
local -r warn=${CLEAR_LINE}"%F{yellow}<%= warn %>%B${MODULE}:%b ${(C)1}. Module contains git submodules, which are not supported by Zim's degit and were not ${1}.%f" local -r warn=${CLEAR_LINE}"%F{yellow}<%= warn %>%B${MODULE}:%b ${(C)1}. Module contains git submodules, which are not supported by Zim's degit and were not ${1}.%f"
if (( PRINTLEVEL > 0 )); then if (( PRINTLEVEL > 0 )); then
@ -134,7 +134,7 @@ create_dir() {
print_error "Error updating ${DIR}" ${ERR} print_error "Error updating ${DIR}" ${ERR}
return 1 return 1
fi fi
print_done updated ${LOG} print_okay updated ${LOG}
} always { } always {
command rm -f ${TARBALL_TARGET} 2>/dev/null command rm -f ${TARBALL_TARGET} 2>/dev/null
command rm -rf ${dir_new} 2>/dev/null command rm -rf ${dir_new} 2>/dev/null

2
src/tools/git.zsh.erb
View file

@ -13,7 +13,7 @@ print_okay() {
case ${ACTION} in case ${ACTION} in
install) install)
if ERR=$(command git clone ${REV:+-b} ${REV} -q --recursive ${URL} ${DIR} 2>&1); then if ERR=$(command git clone ${REV:+-b} ${REV} -q --config core.autocrlf=false --recursive ${URL} ${DIR} 2>&1); then
print_okay Installed print_okay Installed
else else
print_error 'Error during git clone' ${ERR} print_error 'Error during git clone' ${ERR}

8
zimfw.zsh
View file

@ -334,7 +334,7 @@ _zimfw_compile() {
} }
_zimfw_info() { _zimfw_info() {
print -R 'zimfw version: '${_zversion}' (built at 2021-07-11 20:55:58 UTC, previous commit is 2c8f8e3)' print -R 'zimfw version: '${_zversion}' (built at 2021-08-10 01:21:11 UTC, previous commit is 6700933)'
print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'ZIM_HOME: '${ZIM_HOME}
print -R 'Zsh version: '${ZSH_VERSION} print -R 'Zsh version: '${ZSH_VERSION}
print -R 'System info: '$(command uname -a) print -R 'System info: '$(command uname -a)
@ -427,7 +427,7 @@ print_error() {
print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b \${1}%f\"\${2:+$'\n'\${(F):- \${(f)^2}}} print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b \${1}%f\"\${2:+$'\n'\${(F):- \${(f)^2}}}
} }
print_done() { print_okay() {
if [[ -e \${DIR}/.gitmodules ]]; then if [[ -e \${DIR}/.gitmodules ]]; then
local -r warn=\${CLEAR_LINE}\"%F{yellow}! %B\${MODULE}:%b \${(C)1}. Module contains git submodules, which are not supported by Zim's degit and were not \${1}.%f\" local -r warn=\${CLEAR_LINE}\"%F{yellow}! %B\${MODULE}:%b \${(C)1}. Module contains git submodules, which are not supported by Zim's degit and were not \${1}.%f\"
if (( PRINTLEVEL > 0 )); then if (( PRINTLEVEL > 0 )); then
@ -554,7 +554,7 @@ create_dir() {
print_error \"Error updating \${DIR}\" \${ERR} print_error \"Error updating \${DIR}\" \${ERR}
return 1 return 1
fi fi
print_done updated \${LOG} print_okay updated \${LOG}
} always { } always {
command rm -f \${TARBALL_TARGET} 2>/dev/null command rm -f \${TARBALL_TARGET} 2>/dev/null
command rm -rf \${dir_new} 2>/dev/null command rm -rf \${dir_new} 2>/dev/null
@ -578,7 +578,7 @@ print_okay() {
case \${ACTION} in case \${ACTION} in
install) install)
if ERR=\$(command git clone \${REV:+-b} \${REV} -q --recursive \${URL} \${DIR} 2>&1); then if ERR=\$(command git clone \${REV:+-b} \${REV} -q --config core.autocrlf=false --recursive \${URL} \${DIR} 2>&1); then
print_okay Installed print_okay Installed
else else
print_error 'Error during git clone' \${ERR} print_error 'Error during git clone' \${ERR}