Skip to content
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

Jump to bottom

Adding attic support to fetch_osc_and_apply.sh #390

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adding attic support to fetch_osc_and_apply.sh #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23ff39b
added IntelliJ specific project files to ignore lists
ChrissW-R1 Apr 11, 2017
594e6ed
added IntelliJ specific project files to ignore lists
ChrissW-R1 Apr 11, 2017
6b2fc05
Merge remote-tracking branch 'origin/master'
ChrissW-R1 Apr 11, 2017
321d40e
added attic parameter to combined fetch and apply script
ChrissW-R1 Apr 11, 2017
249c4f6
added information about attic support to error message
ChrissW-R1 Apr 11, 2017
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
2 changes: 2 additions & 0 deletions .cvsignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ osmy_vigilance
init_database.sql
init_derived_data.sql

/.idea/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somehow those unrelated changed made it into the pull request. Not a big issue, just wanted to make you aware of it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know about it.
But I didn't want to create an extra branch for this.

*.iml
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/cgi-bin/
/test-bin/

/.idea/
*.iml
2 changes: 1 addition & 1 deletion src/bin/apply_osc_to_db.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ elif [[ $3 == "--meta=no" ]]; then
META=
else
{
echo "You must specify --meta=yes or --meta=no"
echo "You have to specify --meta=yes, --meta=no or --meta=attic"
exit 0
}; fi

Expand Down
8 changes: 6 additions & 2 deletions src/bin/fetch_osc_and_apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

if [[ -z $1 ]]; then
{
echo "Usage: $0 diff_url --meta=(yes|no)"
echo "Error : Set the URL to get diffs from (like http://planet.osm.org/replication/minute )"
echo "Usage: $0 diff_url --meta=(yes|no|attic)"
echo "Error : Set the URL to get diffs from (e.g. http://planet.osm.org/replication/minute )"
exit 0
};
fi
Expand Down Expand Up @@ -107,6 +107,10 @@ META_OPTION=
if [[ $2 == "--meta=yes" ]]; then
{
META_OPTION="--meta"
};
elif [[ $2 == "--meta=attic" ]]; then
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please also update the help usage text in line 22? Thanks in advance.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

META_OPTION="--keep-attic"
}; fi


Expand Down