Add new mkdir tool to generate empty modules
This will allow creating modules that contain only externally generated files. For example, this is how I currently use it to generate modules for code that is supposed to be eval'ed: zmodule-eval() { local -r zcommand=${${=1}[1]} ztarget=${1//[^[:alnum:]]/-}.zsh zmodule custom-${zcommand} --use mkdir --if-command ${zcommand} \ --cmd "if [[ ! {}/${ztarget} -nt \${commands[${zcommand}]} ]]; then ${1} >! {}/${ztarget}; zcompile -UR {}/${ztarget}; fi" \ --source ${ztarget} } zmodule-eval 'starship init zsh' unfunction zmodule-eval
This commit is contained in:
parent
8bec2f7549
commit
2e9256a567
8 changed files with 82 additions and 44 deletions
|
@ -8,7 +8,7 @@ The initialization will be done in the same order it\'s defined.
|
||||||
<url> Module absolute path or repository URL. The following URL formats
|
<url> Module absolute path or repository URL. The following URL formats
|
||||||
are equivalent: <%= bold %>foo<%= normal %>, <%= bold %>zimfw/foo<%= normal %>, <%= bold %>https://github.com/zimfw/foo.git<%= normal %>.
|
are equivalent: <%= bold %>foo<%= normal %>, <%= bold %>zimfw/foo<%= normal %>, <%= bold %>https://github.com/zimfw/foo.git<%= normal %>.
|
||||||
If an absolute path is given, the module is considered externally
|
If an absolute path is given, the module is considered externally
|
||||||
installed, and won\'t be installed or updated by zimfw.
|
installed and won\'t be installed or updated by zimfw.
|
||||||
<%= bold %>-n<%= normal %>|<%= bold %>--name<%= normal %> <module_name> Set a custom module name. Default: the last component in <url>.
|
<%= bold %>-n<%= normal %>|<%= bold %>--name<%= normal %> <module_name> Set a custom module name. Default: the last component in <url>.
|
||||||
Slashes can be used inside the name to organize the module into
|
Slashes can be used inside the name to organize the module into
|
||||||
subdirectories. The module will be installed at
|
subdirectories. The module will be installed at
|
||||||
|
@ -20,13 +20,16 @@ Per-module options:
|
||||||
Overrides the tag option. Default: the repository default branch.
|
Overrides the tag option. Default: the repository default branch.
|
||||||
<%= bold %>-t<%= normal %>|<%= bold %>--tag<%= normal %> <tag_name> Use specified tag when installing and updating the module. Over-
|
<%= bold %>-t<%= normal %>|<%= bold %>--tag<%= normal %> <tag_name> Use specified tag when installing and updating the module. Over-
|
||||||
rides the branch option.
|
rides the branch option.
|
||||||
<%= bold %>-u<%= normal %>|<%= bold %>--use<%= normal %> <<%= bold %>git<%= normal %>|<%= bold %>degit<%= normal %>> Install and update the module using the defined tool. Default is
|
<%= bold %>-u<%= normal %>|<%= bold %>--use<%= normal %> <tool_name> Install and update the module using the defined tool. Default is
|
||||||
either defined by <%= bold %>zstyle \':zim:zmodule\' use \'<%= normal %><<%= bold %>git<%= normal %>|<%= bold %>degit<%= normal %>><%= bold %>\'<%= normal %>, or <%= bold %>git<%= normal %>
|
either defined by <%= bold %>zstyle \':zim:zmodule\' use \'<%= normal %><tool_name><%= bold %>\'<%= normal %>, or <%= bold %>git<%= normal %>
|
||||||
if none is provided.
|
if none is provided. The tools available are:
|
||||||
<%= bold %>git<%= normal %> requires git itself. Local changes are preserved on updates.
|
<%= bold %>git<%= normal %> uses the git command. Local changes are preserved on updates.
|
||||||
<%= bold %>degit<%= normal %> requires curl or wget, and currently only works with GitHub
|
<%= bold %>degit<%= normal %> uses curl or wget, and currently only works with GitHub
|
||||||
URLs. Modules install faster and take less disk space. Local
|
URLs. Modules install faster and take less disk space. Local
|
||||||
changes are lost on updates. Git submodules are not supported.
|
changes are lost on updates. Git submodules are not supported.
|
||||||
|
<%= bold %>mkdir<%= normal %> creates an empty directory. The <url> is only used to set
|
||||||
|
the module name. Use the <%= bold %>-c<%= normal %>|<%= bold %>--cmd<%= normal %> or <%= bold %>--on-pull<%= normal %> options to execute
|
||||||
|
the desired command to generate the module files.
|
||||||
<%= bold %>--no-submodules<%= normal %> Don\'t install or update git submodules.
|
<%= bold %>--no-submodules<%= normal %> Don\'t install or update git submodules.
|
||||||
<%= bold %>-z<%= normal %>|<%= bold %>--frozen<%= normal %> Don\'t install or update the module.
|
<%= bold %>-z<%= normal %>|<%= bold %>--frozen<%= normal %> Don\'t install or update the module.
|
||||||
|
|
||||||
|
@ -36,9 +39,9 @@ Per-module options:
|
||||||
Per-module-root options:
|
Per-module-root options:
|
||||||
<%= bold %>--if<%= normal %> <test> Will only initialize module root if specified test returns a zero
|
<%= bold %>--if<%= normal %> <test> Will only initialize module root if specified test returns a zero
|
||||||
exit status. The test is evaluated at every new terminal startup.
|
exit status. The test is evaluated at every new terminal startup.
|
||||||
<%= bold %>--if-command<%= normal %> <command> Will only initialize module root if specified external command is
|
<%= bold %>--if-command<%= normal %> <cmd_name> Will only initialize module root if specified external command is
|
||||||
available. This is evaluated at every new terminal startup.
|
available. This is evaluated at every new terminal startup.
|
||||||
Equivalent to <%= bold %>--if "(( \\\${+commands[\${1}]} ))"<%= normal %>.
|
Equivalent to <%= bold %>--if \'(( \${+commands[<%= normal %><cmd_name><%= bold %>]} ))\'<%= normal %>.
|
||||||
<%= bold %>--on-pull<%= normal %> <command> Execute command after installing or updating the module. The com-
|
<%= bold %>--on-pull<%= normal %> <command> Execute command after installing or updating the module. The com-
|
||||||
mand is executed in the module root directory.
|
mand is executed in the module root directory.
|
||||||
<%= bold %>-d<%= normal %>|<%= bold %>--disabled<%= normal %> Don\'t initialize the module root or uninstall the module.
|
<%= bold %>-d<%= normal %>|<%= bold %>--disabled<%= normal %> Don\'t initialize the module root or uninstall the module.
|
||||||
|
|
6
src/stage2/70_zimfw_create_dir.zsh.erb
Normal file
6
src/stage2/70_zimfw_create_dir.zsh.erb
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
_zimfw_create_dir() {
|
||||||
|
if ! ERR=$(command mkdir -p ${1} 2>&1); then
|
||||||
|
_zimfw_print_error "Error creating ${1}" ${ERR}
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
3
src/stage2/70_zimfw_print_warn.zsh.erb
Normal file
3
src/stage2/70_zimfw_print_warn.zsh.erb
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
_zimfw_print_warn() {
|
||||||
|
_zimfw_print -u2 -R $'<%= clear_line %><%= yellow %><%= warn %><%= bold %>'${_zname}$':<%= normalyellow %> '${1}$'<%= normal %>'
|
||||||
|
}
|
|
@ -77,13 +77,6 @@ _zimfw_untar_tarball() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
_zimfw_create_dir() {
|
|
||||||
if ! ERR=$(command mkdir -p ${1} 2>&1); then
|
|
||||||
_zimfw_print_error "Error creating ${1}" ${ERR}
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_zimfw_tool_degit() {
|
_zimfw_tool_degit() {
|
||||||
# This runs in a subshell
|
# This runs in a subshell
|
||||||
readonly -i SUBMODULES=${5}
|
readonly -i SUBMODULES=${5}
|
||||||
|
@ -102,7 +95,7 @@ _zimfw_tool_degit() {
|
||||||
;;
|
;;
|
||||||
check|update)
|
check|update)
|
||||||
if [[ ! -r ${INFO_TARGET} ]]; then
|
if [[ ! -r ${INFO_TARGET} ]]; then
|
||||||
_zimfw_print -u2 -R $'<%= clear_line %><%= yellow %><%= warn %><%= bold %>'${_zname}$':<%= normalyellow %> Module was not installed using zimfw\'s degit. Will not try to '${_zaction}$'. Use zmodule option <%= bold %>-z<%= normalyellow %>|<%= bold %>--frozen<%= normalyellow %> to disable this warning.<%= normal %>'
|
_zimfw_print_warn $'Module was not installed using zimfw\'s degit. Will not try to '${_zaction}$'. Use zmodule option <%= bold %>-z<%= normalyellow %>|<%= bold %>--frozen<%= normalyellow %> to disable this warning.'
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
readonly DIR_NEW=${DIR}${TEMP}
|
readonly DIR_NEW=${DIR}${TEMP}
|
||||||
|
@ -139,7 +132,7 @@ _zimfw_tool_degit() {
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# Check after successful install or update
|
# Check after successful install or update
|
||||||
if [[ ${_zprintlevel} -gt 0 && ${SUBMODULES} -ne 0 && -e ${DIR}/.gitmodules ]]; then
|
if [[ ${SUBMODULES} -ne 0 && -e ${DIR}/.gitmodules ]]; then
|
||||||
print -u2 -R $'<%= clear_line %><%= yellow %><%= warn %><%= bold %>'${_zname}$':<%= normalyellow %> Module contains git submodules, which are not supported by zimfw\'s degit. Use zmodule option <%= bold %>--no-submodules<%= normalyellow %> to disable this warning.<%= normal %>'
|
_zimfw_print_warn $'Module contains git submodules, which are not supported by zimfw\'s degit. Use zmodule option <%= bold %>--no-submodules<%= normalyellow %> to disable this warning.'
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ _zimfw_tool_git() {
|
||||||
;;
|
;;
|
||||||
check|update)
|
check|update)
|
||||||
if [[ ! -r ${DIR}/.git ]]; then
|
if [[ ! -r ${DIR}/.git ]]; then
|
||||||
_zimfw_print -u2 -R $'<%= clear_line %><%= yellow %><%= warn %><%= bold %>'${_zname}$':<%= normalyellow %> Module was not installed using git. Will not try to '${_zaction}$'. Use zmodule option <%= bold %>-z<%= normalyellow %>|<%= bold %>--frozen<%= normalyellow %> to disable this warning.<%= normal %>'
|
_zimfw_print_warn 'Module was not installed using git. Will not try to '${_zaction}$'. Use zmodule option <%= bold %>-z<%= normalyellow %>|<%= bold %>--frozen<%= normalyellow %> to disable this warning.'
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
if [[ ${URL} != $(command git -C ${DIR} config --get remote.origin.url) ]]; then
|
if [[ ${URL} != $(command git -C ${DIR} config --get remote.origin.url) ]]; then
|
||||||
|
|
14
src/stage2/75_zimfw_tool_mkdir.zsh.erb
Normal file
14
src/stage2/75_zimfw_tool_mkdir.zsh.erb
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
_zimfw_tool_mkdir() {
|
||||||
|
# This runs in a subshell
|
||||||
|
readonly -i SUBMODULES=${5}
|
||||||
|
readonly DIR=${1} TYPE=${3} REV=${4} ONPULL=${6}
|
||||||
|
if [[ -n ${REV} ]]; then
|
||||||
|
_zimfw_print_warn $'The zmodule option <%= bold %>-'${TYPE[1]}$'<%= normalyellow %>|<%= bold %>--'${TYPE}$'<%= normalyellow %> has no effect when using the mkdir tool'
|
||||||
|
fi
|
||||||
|
if (( ! SUBMODULES )); then
|
||||||
|
_zimfw_print_warn $'The zmodule option <%= bold %>--no-submodules<%= normalyellow %> has no effect when using the mkdir tool'
|
||||||
|
fi
|
||||||
|
if [[ ! -d ${DIR} || -n ${ONPULL} ]]; then
|
||||||
|
_zimfw_create_dir ${DIR} && _zimfw_pull_print_okay Created || return 1
|
||||||
|
fi
|
||||||
|
}
|
|
@ -34,7 +34,7 @@ _zimfw_run_tool() {
|
||||||
esac
|
esac
|
||||||
local -r ztool=${_ztools[${_zname}]}
|
local -r ztool=${_ztools[${_zname}]}
|
||||||
case ${ztool} in
|
case ${ztool} in
|
||||||
degit|git)
|
degit|git|mkdir)
|
||||||
_zimfw_tool_${ztool} "${_zdirs[${_zname}]}" "${_zurls[${_zname}]}" "${_ztypes[${_zname}]}" "${_zrevs[${_zname}]}" "${_zsubmodules[${_zname}]}" "${_zonpulls[${_zname}]}"
|
_zimfw_tool_${ztool} "${_zdirs[${_zname}]}" "${_zurls[${_zname}]}" "${_ztypes[${_zname}]}" "${_zrevs[${_zname}]}" "${_zsubmodules[${_zname}]}" "${_zonpulls[${_zname}]}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
67
zimfw.zsh
67
zimfw.zsh
|
@ -106,9 +106,6 @@ _zimfw_build_login_init() {
|
||||||
) ${ztarget}
|
) ${ztarget}
|
||||||
}
|
}
|
||||||
|
|
||||||
zeval() {
|
|
||||||
}
|
|
||||||
|
|
||||||
_zimfw_build() {
|
_zimfw_build() {
|
||||||
_zimfw_build_init && _zimfw_build_login_init && _zimfw_print 'Done with build.'
|
_zimfw_build_init && _zimfw_build_login_init && _zimfw_print 'Done with build.'
|
||||||
}
|
}
|
||||||
|
@ -123,7 +120,7 @@ The initialization will be done in the same order it\'s defined.
|
||||||
<url> Module absolute path or repository URL. The following URL formats
|
<url> Module absolute path or repository URL. The following URL formats
|
||||||
are equivalent: \E[1mfoo\E[0m, \E[1mzimfw/foo\E[0m, \E[1mhttps://github.com/zimfw/foo.git\E[0m.
|
are equivalent: \E[1mfoo\E[0m, \E[1mzimfw/foo\E[0m, \E[1mhttps://github.com/zimfw/foo.git\E[0m.
|
||||||
If an absolute path is given, the module is considered externally
|
If an absolute path is given, the module is considered externally
|
||||||
installed, and won\'t be installed or updated by zimfw.
|
installed and won\'t be installed or updated by zimfw.
|
||||||
\E[1m-n\E[0m|\E[1m--name\E[0m <module_name> Set a custom module name. Default: the last component in <url>.
|
\E[1m-n\E[0m|\E[1m--name\E[0m <module_name> Set a custom module name. Default: the last component in <url>.
|
||||||
Slashes can be used inside the name to organize the module into
|
Slashes can be used inside the name to organize the module into
|
||||||
subdirectories. The module will be installed at
|
subdirectories. The module will be installed at
|
||||||
|
@ -135,13 +132,16 @@ Per-module options:
|
||||||
Overrides the tag option. Default: the repository default branch.
|
Overrides the tag option. Default: the repository default branch.
|
||||||
\E[1m-t\E[0m|\E[1m--tag\E[0m <tag_name> Use specified tag when installing and updating the module. Over-
|
\E[1m-t\E[0m|\E[1m--tag\E[0m <tag_name> Use specified tag when installing and updating the module. Over-
|
||||||
rides the branch option.
|
rides the branch option.
|
||||||
\E[1m-u\E[0m|\E[1m--use\E[0m <\E[1mgit\E[0m|\E[1mdegit\E[0m> Install and update the module using the defined tool. Default is
|
\E[1m-u\E[0m|\E[1m--use\E[0m <tool_name> Install and update the module using the defined tool. Default is
|
||||||
either defined by \E[1mzstyle \':zim:zmodule\' use \'\E[0m<\E[1mgit\E[0m|\E[1mdegit\E[0m>\E[1m\'\E[0m, or \E[1mgit\E[0m
|
either defined by \E[1mzstyle \':zim:zmodule\' use \'\E[0m<tool_name>\E[1m\'\E[0m, or \E[1mgit\E[0m
|
||||||
if none is provided.
|
if none is provided. The tools available are:
|
||||||
\E[1mgit\E[0m requires git itself. Local changes are preserved on updates.
|
\E[1mgit\E[0m uses the git command. Local changes are preserved on updates.
|
||||||
\E[1mdegit\E[0m requires curl or wget, and currently only works with GitHub
|
\E[1mdegit\E[0m uses curl or wget, and currently only works with GitHub
|
||||||
URLs. Modules install faster and take less disk space. Local
|
URLs. Modules install faster and take less disk space. Local
|
||||||
changes are lost on updates. Git submodules are not supported.
|
changes are lost on updates. Git submodules are not supported.
|
||||||
|
\E[1mmkdir\E[0m creates an empty directory. The <url> is only used to set
|
||||||
|
the module name. Use the \E[1m-c\E[0m|\E[1m--cmd\E[0m or \E[1m--on-pull\E[0m options to execute
|
||||||
|
the desired command to generate the module files.
|
||||||
\E[1m--no-submodules\E[0m Don\'t install or update git submodules.
|
\E[1m--no-submodules\E[0m Don\'t install or update git submodules.
|
||||||
\E[1m-z\E[0m|\E[1m--frozen\E[0m Don\'t install or update the module.
|
\E[1m-z\E[0m|\E[1m--frozen\E[0m Don\'t install or update the module.
|
||||||
|
|
||||||
|
@ -151,9 +151,9 @@ Per-module options:
|
||||||
Per-module-root options:
|
Per-module-root options:
|
||||||
\E[1m--if\E[0m <test> Will only initialize module root if specified test returns a zero
|
\E[1m--if\E[0m <test> Will only initialize module root if specified test returns a zero
|
||||||
exit status. The test is evaluated at every new terminal startup.
|
exit status. The test is evaluated at every new terminal startup.
|
||||||
\E[1m--if-command\E[0m <command> Will only initialize module root if specified external command is
|
\E[1m--if-command\E[0m <cmd_name> Will only initialize module root if specified external command is
|
||||||
available. This is evaluated at every new terminal startup.
|
available. This is evaluated at every new terminal startup.
|
||||||
Equivalent to \E[1m--if "(( \\\${+commands[\${1}]} ))"\E[0m.
|
Equivalent to \E[1m--if \'(( \${+commands[\E[0m<cmd_name>\E[1m]} ))\'\E[0m.
|
||||||
\E[1m--on-pull\E[0m <command> Execute command after installing or updating the module. The com-
|
\E[1m--on-pull\E[0m <command> Execute command after installing or updating the module. The com-
|
||||||
mand is executed in the module root directory.
|
mand is executed in the module root directory.
|
||||||
\E[1m-d\E[0m|\E[1m--disabled\E[0m Don\'t initialize the module root or uninstall the module.
|
\E[1m-d\E[0m|\E[1m--disabled\E[0m Don\'t initialize the module root or uninstall the module.
|
||||||
|
@ -454,7 +454,7 @@ _zimfw_compile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_zimfw_info() {
|
_zimfw_info() {
|
||||||
print -R 'zimfw version: '${_zversion}' (built at 2024-01-23 02:30:19 UTC, previous commit is 5f649d3)'
|
print -R 'zimfw version: '${_zversion}' (built at 2024-02-17 01:39:24 UTC, previous commit is 8bec2f7)'
|
||||||
local zparam
|
local zparam
|
||||||
for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZIM_HOME ZSH_VERSION; do
|
for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZIM_HOME ZSH_VERSION; do
|
||||||
print -R ${(r.22....:.)zparam}${(P)zparam}
|
print -R ${(r.22....:.)zparam}${(P)zparam}
|
||||||
|
@ -539,6 +539,13 @@ _zimfw_run_list() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_zimfw_create_dir() {
|
||||||
|
if ! ERR=$(command mkdir -p ${1} 2>&1); then
|
||||||
|
_zimfw_print_error "Error creating ${1}" ${ERR}
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
_zimfw_print_error() {
|
_zimfw_print_error() {
|
||||||
print -u2 -lR $'\E[2K\r\E[31mx \E[1m'${_zname}$':\E[0;31m '${1}$'\E[0m' ${2:+${(F):- ${(f)^2}}}
|
print -u2 -lR $'\E[2K\r\E[31mx \E[1m'${_zname}$':\E[0;31m '${1}$'\E[0m' ${2:+${(F):- ${(f)^2}}}
|
||||||
}
|
}
|
||||||
|
@ -547,6 +554,10 @@ _zimfw_print_okay() {
|
||||||
if (( _zprintlevel > ${2:-0} )) print -lR $'\E[2K\r\E[32m)\E[0m \E[1m'${_zname}$':\E[0m '${1} ${3:+${(F):- ${(f)^3}}}
|
if (( _zprintlevel > ${2:-0} )) print -lR $'\E[2K\r\E[32m)\E[0m \E[1m'${_zname}$':\E[0m '${1} ${3:+${(F):- ${(f)^3}}}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_zimfw_print_warn() {
|
||||||
|
_zimfw_print -u2 -R $'\E[2K\r\E[33m! \E[1m'${_zname}$':\E[0;33m '${1}$'\E[0m'
|
||||||
|
}
|
||||||
|
|
||||||
_zimfw_pull_print_okay() {
|
_zimfw_pull_print_okay() {
|
||||||
# Useb by tools, which run in a subshell
|
# Useb by tools, which run in a subshell
|
||||||
if [[ -n ${ONPULL} ]]; then
|
if [[ -n ${ONPULL} ]]; then
|
||||||
|
@ -640,13 +651,6 @@ _zimfw_untar_tarball() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
_zimfw_create_dir() {
|
|
||||||
if ! ERR=$(command mkdir -p ${1} 2>&1); then
|
|
||||||
_zimfw_print_error "Error creating ${1}" ${ERR}
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_zimfw_tool_degit() {
|
_zimfw_tool_degit() {
|
||||||
# This runs in a subshell
|
# This runs in a subshell
|
||||||
readonly -i SUBMODULES=${5}
|
readonly -i SUBMODULES=${5}
|
||||||
|
@ -665,7 +669,7 @@ _zimfw_tool_degit() {
|
||||||
;;
|
;;
|
||||||
check|update)
|
check|update)
|
||||||
if [[ ! -r ${INFO_TARGET} ]]; then
|
if [[ ! -r ${INFO_TARGET} ]]; then
|
||||||
_zimfw_print -u2 -R $'\E[2K\r\E[33m! \E[1m'${_zname}$':\E[0;33m Module was not installed using zimfw\'s degit. Will not try to '${_zaction}$'. Use zmodule option \E[1m-z\E[0;33m|\E[1m--frozen\E[0;33m to disable this warning.\E[0m'
|
_zimfw_print_warn $'Module was not installed using zimfw\'s degit. Will not try to '${_zaction}$'. Use zmodule option \E[1m-z\E[0;33m|\E[1m--frozen\E[0;33m to disable this warning.'
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
readonly DIR_NEW=${DIR}${TEMP}
|
readonly DIR_NEW=${DIR}${TEMP}
|
||||||
|
@ -702,8 +706,8 @@ _zimfw_tool_degit() {
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# Check after successful install or update
|
# Check after successful install or update
|
||||||
if [[ ${_zprintlevel} -gt 0 && ${SUBMODULES} -ne 0 && -e ${DIR}/.gitmodules ]]; then
|
if [[ ${SUBMODULES} -ne 0 && -e ${DIR}/.gitmodules ]]; then
|
||||||
print -u2 -R $'\E[2K\r\E[33m! \E[1m'${_zname}$':\E[0;33m Module contains git submodules, which are not supported by zimfw\'s degit. Use zmodule option \E[1m--no-submodules\E[0;33m to disable this warning.\E[0m'
|
_zimfw_print_warn $'Module contains git submodules, which are not supported by zimfw\'s degit. Use zmodule option \E[1m--no-submodules\E[0;33m to disable this warning.'
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -723,7 +727,7 @@ _zimfw_tool_git() {
|
||||||
;;
|
;;
|
||||||
check|update)
|
check|update)
|
||||||
if [[ ! -r ${DIR}/.git ]]; then
|
if [[ ! -r ${DIR}/.git ]]; then
|
||||||
_zimfw_print -u2 -R $'\E[2K\r\E[33m! \E[1m'${_zname}$':\E[0;33m Module was not installed using git. Will not try to '${_zaction}$'. Use zmodule option \E[1m-z\E[0;33m|\E[1m--frozen\E[0;33m to disable this warning.\E[0m'
|
_zimfw_print_warn 'Module was not installed using git. Will not try to '${_zaction}$'. Use zmodule option \E[1m-z\E[0;33m|\E[1m--frozen\E[0;33m to disable this warning.'
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
if [[ ${URL} != $(command git -C ${DIR} config --get remote.origin.url) ]]; then
|
if [[ ${URL} != $(command git -C ${DIR} config --get remote.origin.url) ]]; then
|
||||||
|
@ -801,6 +805,21 @@ _zimfw_tool_git() {
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_zimfw_tool_mkdir() {
|
||||||
|
# This runs in a subshell
|
||||||
|
readonly -i SUBMODULES=${5}
|
||||||
|
readonly DIR=${1} TYPE=${3} REV=${4} ONPULL=${6}
|
||||||
|
if [[ -n ${REV} ]]; then
|
||||||
|
_zimfw_print_warn $'The zmodule option \E[1m-'${TYPE[1]}$'\E[0;33m|\E[1m--'${TYPE}$'\E[0;33m has no effect when using the mkdir tool'
|
||||||
|
fi
|
||||||
|
if (( ! SUBMODULES )); then
|
||||||
|
_zimfw_print_warn $'The zmodule option \E[1m--no-submodules\E[0;33m has no effect when using the mkdir tool'
|
||||||
|
fi
|
||||||
|
if [[ ! -d ${DIR} || -n ${ONPULL} ]]; then
|
||||||
|
_zimfw_create_dir ${DIR} && _zimfw_pull_print_okay Created || return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
_zimfw_run_tool() {
|
_zimfw_run_tool() {
|
||||||
local -r _zname=${1}
|
local -r _zname=${1}
|
||||||
if [[ -z ${_zurls[${_zname}]} ]]; then
|
if [[ -z ${_zurls[${_zname}]} ]]; then
|
||||||
|
@ -837,7 +856,7 @@ _zimfw_run_tool() {
|
||||||
esac
|
esac
|
||||||
local -r ztool=${_ztools[${_zname}]}
|
local -r ztool=${_ztools[${_zname}]}
|
||||||
case ${ztool} in
|
case ${ztool} in
|
||||||
degit|git)
|
degit|git|mkdir)
|
||||||
_zimfw_tool_${ztool} "${_zdirs[${_zname}]}" "${_zurls[${_zname}]}" "${_ztypes[${_zname}]}" "${_zrevs[${_zname}]}" "${_zsubmodules[${_zname}]}" "${_zonpulls[${_zname}]}"
|
_zimfw_tool_${ztool} "${_zdirs[${_zname}]}" "${_zurls[${_zname}]}" "${_ztypes[${_zname}]}" "${_zrevs[${_zname}]}" "${_zsubmodules[${_zname}]}" "${_zonpulls[${_zname}]}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
Loading…
Reference in a new issue