diff --git a/home/dotfiles/local/bin/makepkg-customizepkg b/home/dotfiles/local/bin/makepkg-customizepkg index 2674b1d..f963d24 100755 --- a/home/dotfiles/local/bin/makepkg-customizepkg +++ b/home/dotfiles/local/bin/makepkg-customizepkg @@ -10,6 +10,8 @@ USER_CONF_DIR_PATH="${HOME}/.customizepkg" pkgbuild_path="${CURRENT_DIR_PATH}/PKGBUILD" pkgbuild_copy_path="${pkgbuild_path}.original" +args=("$@") + function is_readable_file { local file_path="${1:-''}" local ret=1 @@ -20,16 +22,21 @@ function is_readable_file { } if is_readable_file "$pkgbuild_path" && - ! is_readable_file "$pkgbuild_copy_path";then - eval $(grep -Pazo '[^[:print:]][[:blank:]]*_?(pkg.*|name)=(\((.|\n)*?\)|.*?(?=\x0a))' ./PKGBUILD | sed 's, #.*$,,' | grep -Eva '\$\(|`|pkgdesc') - if [[ -n "${pkgname:-''}" ]];then - global_conf_path="${GLOBAL_CONF_DIR_PATH}/${pkgname}" - user_conf_path="${USER_CONF_DIR_PATH}/${pkgname}" - if is_readable_file "$global_conf_path" || - is_readable_file "$user_conf_path";then - customizepkg --modify - fi - fi + [ $(git status --porcelain --no-renames PKGBUILD | wc -l) -lt 1 ]; then +# ! is_readable_file "$pkgbuild_copy_path";then + + #eval $(grep -Pazo '[^[:print:]][[:blank:]]*_?(pkg.*|name)=(\((.|\n)*?\)|[^#]*?(?= *#|\x0a))' ./PKGBUILD | grep -Eva '\$\(|`|pkgdesc') + + #if [[ -n "${pkgname:-''}" ]];then + # global_conf_path="${GLOBAL_CONF_DIR_PATH}/${pkgname}" + # user_conf_path="${USER_CONF_DIR_PATH}/${pkgname}" + # if is_readable_file "$global_conf_path" || + # is_readable_file "$user_conf_path";then + git checkout HEAD PKGBUILD + customizepkg --modify >&2 + #touch "${was_already_patched_path}" + # fi + #fi fi -exec /usr/bin/makepkg ${@} +exec makepkg "${args[@]}"