Skip to content

Feature/fix build issues #26

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 3 commits into from
Oct 25, 2018
Merged

Feature/fix build issues #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fb3c22
Check for pkg-config, otherwise abort installation
rrcarlosrodriguez Oct 25, 2018
576ed20
Change source by . to support a shell different than bash
rrcarlosrodriguez Oct 25, 2018
89180ae
Use bash directly to avoid issues with shopt on different shells
rrcarlosrodriguez Oct 25, 2018
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
9 changes: 8 additions & 1 deletion common/autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ run_sanity_checks()
{
log_error "not found! Please install the automake package."
exit 1
}
}

log_info "Checking for pkg-config"
which "pkg-config" >/dev/null ||
{
log_error "not found! Please install the pkg-config package."
exit 1
}
}

install_git_hook()
Expand Down
2 changes: 1 addition & 1 deletion common/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ config_main()
config_find_config_file

if [ -r "$RRCONFIG" ]; then
source $RRCONFIG
. $RRCONFIG
else
log_info "No custom config found. Using defaults"
fi
Expand Down
3 changes: 2 additions & 1 deletion common/rr-indent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
# Copyright (C) 2018 RidgeRun, LLC (http://www.ridgerun.com)
# All Rights Reserved.
#
Expand All @@ -13,6 +13,7 @@
LOGGER_PROJECT_TAG="INDENT"; . common/logger.sh

# Used for configurable pattern matching
# FIXME: Find the portable way to use shopt instead of using bash directly
shopt -s extglob

indent_tool="astyle"
Expand Down