summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-03-05 18:53:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-03-05 18:53:28 +0200
commit2e9a698a0efdfe179cea557d7a204cdfaaca1b43 (patch)
tree983e18fdd38b51e19870fd28c1f63016750fadbd
parentdc0ebced649c7ca5ff93884ec2fecdebac2818b1 (diff)
Adjust to renamed repository manifest files
-rwxr-xr-xrep-test12
-rwxr-xr-xrep-update14
2 files changed, 13 insertions, 13 deletions
diff --git a/rep-test b/rep-test
index 2e45840..09541b6 100755
--- a/rep-test
+++ b/rep-test
@@ -5,9 +5,9 @@
# Usage: update [options] <dir>
#
# First, the script determines the list of repositories/sections. If <dir>
-# contains the 'repositories' file, then it is the only repository to be
-# tested. Otherwise, every first-level subdirectory of <dir> that doesn't
-# start with '.' and contains the 'repositories' file is to be tested.
+# contains the repositories.manifest file, then it is the only repository to
+# be tested. Otherwise, every first-level subdirectory of <dir> that doesn't
+# start with '.' and contains the repositories.manifest file is to be tested.
#
# Then, it makes sure that every package in every repository can be built
# in a clean configuration.
@@ -126,7 +126,7 @@ function check_new () # <pkg> <ver>
#
rep=
-if [ -f "$dir/repositories" ]; then
+if [ -f "$dir/repositories.manifest" ]; then
rep=$dir
else
sub=`find $dir -mindepth 1 -maxdepth 1 -type d -name '[^.]*'`
@@ -139,10 +139,10 @@ else
info "skipping excluded $d/"
continue
fi
- if [ -f "$d/repositories" ]; then
+ if [ -f "$d/repositories.manifest" ]; then
rep+=" $d"
else
- info "no 'repositories' file in $d/, skipping"
+ info "no repositories.manifest file in $d/, skipping"
fi
done
diff --git a/rep-update b/rep-update
index cb40441..e66baf5 100755
--- a/rep-update
+++ b/rep-update
@@ -1,12 +1,12 @@
#! /usr/bin/env bash
-# Update (or create) bpkg 'packages' files in repository.
+# Update (or create) bpkg packages.manifest files in repository.
#
# Usage: update [-t <toolchain>] [-e <subdir>] <dir> [<bpkg-options>]
#
# This script runs the rep-create command for every first-level subdirectory
-# of <dir> that doesn't start with '.' and contains the 'repositories' file,
-# unless <dir> itself contains 'repositories'.
+# of <dir> that doesn't start with '.' and contains the repositories.manifest
+# file, unless <dir> itself contains repositories.manifest.
#
# -e <subdir>
# Exclude the specified sub-directory. Currently only one directory can
@@ -60,13 +60,13 @@ else
fi
fi
-if [ -f "$dir/repositories" ]; then
+if [ -f "$dir/repositories.manifest" ]; then
sub=$dir
else
sub=`find $dir -mindepth 1 -maxdepth 1 -type d -name '[^.]*'`
if [ -z "$sub" ]; then
- error "no 'repositories' file or subdirectories in $dir/"
+ error "no repositories.manifest file or subdirectories in $dir/"
fi
fi
@@ -76,9 +76,9 @@ for d in $sub; do
continue
fi
- if [ -f "$d/repositories" ]; then
+ if [ -f "$d/repositories.manifest" ]; then
$bpkg rep-create "$@" $d
else
- echo "no 'repositories' file in $d/, skipping" 1>&2
+ echo "no repositories.manifest file in $d/, skipping" 1>&2
fi
done