Skip to content

treehouses services available based on arm type (fixes #1028) #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2020
Merged

treehouses services available based on arm type (fixes #1028) #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0549d39
initial
kjong Apr 9, 2020
08e809a
remove check_arm
kjong Apr 9, 2020
1c1d130
Update package.json
dogi Apr 9, 2020
1c902d7
Merge branch 'master' into services-available-detectarm
dogi Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions modules/services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ function services {
for file in $SERVICES/*
do
if [[ ! $file = *"README.md"* ]]; then
echo "${file##*/}" | sed -e 's/^install-//' -e 's/.sh$//'
service=$(echo "${file##*/}" | sed -e 's/^install-//' -e 's/.sh$//')
if check_arm $service; then
echo $service
fi
fi
done
else
Expand Down Expand Up @@ -85,7 +88,6 @@ function services {
exit 1
else
check_available_services $service_name
check_arm $service_name
case "$command" in
install)
checkargn $# 2
Expand Down Expand Up @@ -393,11 +395,7 @@ function check_arm {
return 0
fi
done
echo "ERROR: unsupported arm"
echo "user arm: $(detectarm)"
echo "supported arm(s): ${arms[*]}"
exit 1
# return 1
return 1
}

function check_available_services {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@treehouses/cli",
"version": "1.17.20",
"version": "1.17.21",
"remote": "2251",
"description": "Thin command-line interface for Raspberry Pi low level configuration.",
"main": "cli.sh",
Expand Down