diff options
| -rwxr-xr-x | bin/pkg | 8 | ||||
| -rwxr-xr-x | include/pkglist | 22 |
2 files changed, 3 insertions, 27 deletions
@@ -266,16 +266,8 @@ function list_update_remote { export PDIR if [[ $PKG_PROTO == 'ssh' ]] { ssh $PKG_USER@$PKG_HOST "PDIR='$PDIR' $PKG_PATH/core/include/pkglist $PKG_PATH" > .list-remote - if [[ ${#$(cat .list-remote)} == 0 ]] { - scp -q $PKG_USER@$PKG_HOST:$PKG_PATH/.list .list-remote - warn "The pkglist version on your packages_root is outdated, please update\n" - } } elif [[ $PKG_PROTO == 'file' ]] { $PKG_PATH/core/include/pkglist $PKG_PATH > .list-remote - if [[ ${#$(cat .list-remote)} == 0 ]] { - cp $PKG_ROOT/.list .list-remote - warn "The pkglist version on your packages_root is outdated, please update\n" - } } } diff --git a/include/pkglist b/include/pkglist index 5ae2db5..8724ed2 100755 --- a/include/pkglist +++ b/include/pkglist @@ -1,28 +1,12 @@ #!/usr/bin/env zsh -# Some backwards-compatibility foobar... -# XXX: Remove this as soon as everyone should have the new version -typeset -g -i newmode=0 -[[ -n $PDIR ]] && newmode=1 -(( newmode )) || cd $1 || exit 100 -(( newmode )) && cd /${(j:/:)${(s:/:)0}[1,-4]} - -(( newmode )) || rm -f .list +cd /${(j:/:)${(s:/:)0}[1,-4]} for i in *(/,@); { if [[ -d $i/.git ]] { - if (( newmode )) { - echo -n "$i git " - echo ${$(git --git-dir=$i/.git log -n 1)[2]} - } else { - echo -n "$i git " >> .list - echo ${$(git --git-dir=$i/.git log -n 1)[2]} >> .list - } + echo -n "$i git " + echo ${$(git --git-dir=$i/.git log -n 1)[2]} } else { echo "$i: Unsupported or no repository" >&2 } } - -if (( newmode == 0 )) { - echo "Running pkglist manually or via cron is no longer neccessary and therefore depracated" >&2 -} |