From ddbca0c7df338b3d8563175ef244ece2b5eba2af Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 20 Aug 2017 16:32:16 -0400 Subject: simplify subtree decision making --- package.inc.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package.inc.sh b/package.inc.sh index a0e5ce4..3a64912 100644 --- a/package.inc.sh +++ b/package.inc.sh @@ -103,7 +103,7 @@ package_show_file() { } package_list_files() { - local remote + local remote subtree=trunk pkgname=$1 if [[ $pkgname = */* ]]; then @@ -114,8 +114,6 @@ package_list_files() { if [[ $repo ]]; then subtree=repos/$repo-$OPT_ARCH - else - subtree=trunk fi @@ -124,7 +122,7 @@ package_list_files() { } package_export() { - local remote repo arch path + local remote repo arch path subtree=trunk pkgname=$1 if [[ $pkgname = */* ]]; then @@ -135,8 +133,6 @@ package_export() { if [[ $repo ]]; then subtree=repos/$repo-$OPT_ARCH - else - subtree=trunk fi if [[ -z $(git ls-tree "remotes/$remote/packages/$pkgname" "$subtree/") ]]; then -- cgit v1.2.3-70-g09d2