Reduce supported labels for architecture

This commit is contained in:
Tim Byrne 2022-02-21 14:01:08 -06:00
parent 39d0c791ce
commit ebb6715aad
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
4 changed files with 4 additions and 4 deletions

View File

@ -82,7 +82,7 @@ def test_relative_link(runner, paths, yadm_alt):
@pytest.mark.parametrize('suffix', [ @pytest.mark.parametrize('suffix', [
'##default', '##default',
'##default,e.txt', '##default,extension.txt', '##default,e.txt', '##default,extension.txt',
'##a.$tst_arch', '##arch.$tst_arch', '##architecture.$tst_arch', '##a.$tst_arch', '##arch.$tst_arch',
'##o.$tst_sys', '##os.$tst_sys', '##o.$tst_sys', '##os.$tst_sys',
'##d.$tst_distro', '##distro.$tst_distro', '##d.$tst_distro', '##distro.$tst_distro',
'##f.$tst_distro_family', '##distro_family.$tst_distro_family', '##f.$tst_distro_family', '##distro_family.$tst_distro_family',

View File

@ -7,7 +7,7 @@ CONDITION = {
'modifier': 0, 'modifier': 0,
}, },
'arch': { 'arch': {
'labels': ['a', 'arch', 'architecture'], 'labels': ['a', 'arch'],
'modifier': 1, 'modifier': 1,
}, },
'system': { 'system': {

2
yadm
View File

@ -189,7 +189,7 @@ function score_file() {
if [[ "$label" =~ ^(default)$ ]]; then if [[ "$label" =~ ^(default)$ ]]; then
score=$((score + 0)) score=$((score + 0))
# variable conditions # variable conditions
elif [[ "$label" =~ ^(a|arch|architecture)$ ]]; then elif [[ "$label" =~ ^(a|arch)$ ]]; then
if [ "$value" = "$local_arch" ]; then if [ "$value" = "$local_arch" ]; then
score=$((score + 1)) score=$((score + 1))
else else

2
yadm.1
View File

@ -518,7 +518,7 @@ Valid if the value matches the OS.
OS is calculated by running OS is calculated by running
.BR "uname -s" . .BR "uname -s" .
.TP .TP
.BR architecture , " arch" , " a .BR arch , " a
Valid if the value matches the architecture. Valid if the value matches the architecture.
Architecture is calculated by running Architecture is calculated by running
.BR "uname -m" . .BR "uname -m" .