From 0230d5aad328b2426afe295d40a6367de0a8567f Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Wed, 26 Feb 2020 05:51:59 -0500 Subject: [PATCH] Fill in missing standard file headers --- bin/bactivate | 3 +++ bin/bconst | 3 +++ bin/bdecrypt | 3 +++ bin/bdelete | 3 +++ bin/bencrypt | 3 +++ bin/bget | 3 +++ bin/bgeti | 3 +++ bin/bgeti1 | 3 +++ bin/bgetn | 3 +++ bin/bgetn1 | 3 +++ bin/bmodel | 3 +++ bin/bpatch | 3 +++ bin/bpatchfull | 3 +++ bin/bpost | 3 +++ bin/bposte | 3 +++ bin/bput | 3 +++ bin/bpute | 3 +++ bin/bscript | 3 +++ bin/bubble | 3 +++ bin/bubble_common | 4 +++- bin/build_dist | 3 +++ bin/bunlock | 3 +++ bin/cleanup_bubble_databases | 3 +++ bin/create_user_and_network | 3 +++ bin/first_time_setup.sh | 3 +++ bin/first_time_ubuntu.sh | 4 +++- bin/git_update_bubble.sh | 3 +++ bin/jq-all-vals | 3 +++ bin/list_bubble_databases | 3 +++ bin/new_bubble.sh | 3 +++ bin/prep_bubble_jar | 3 +++ bin/proxy | 3 +++ bin/reset_bubble_db | 3 +++ bin/run.sh | 3 +++ bin/update_role | 3 +++ bubble-server/pom.xml | 7 +------ .../src/main/resources/META-INF/bubble/bubble.properties | 2 +- pom.xml | 5 +---- utils/cobbzilla-utils | 2 +- 39 files changed, 109 insertions(+), 14 deletions(-) diff --git a/bin/bactivate b/bin/bactivate index a3a8e8fc..a1da87f6 100755 --- a/bin/bactivate +++ b/bin/bactivate @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Initial activation of a bubble server # # Usage: activate activation.json diff --git a/bin/bconst b/bin/bconst index 7a925a32..e13d9b33 100755 --- a/bin/bconst +++ b/bin/bconst @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Write a constant value to stdout. # # This will only ever write the constant value to stdout if it can successfully be read. diff --git a/bin/bdecrypt b/bin/bdecrypt index ad359b20..e551ad45 100755 --- a/bin/bdecrypt +++ b/bin/bdecrypt @@ -1,4 +1,7 @@ #!/bin/bash +# +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# SCRIPT="${0}" SCRIPT_DIR=$(cd $(dirname ${SCRIPT}) && pwd) . ${SCRIPT_DIR}/bubble_common diff --git a/bin/bdelete b/bin/bdelete index 40f7d11e..697d6f25 100755 --- a/bin/bdelete +++ b/bin/bdelete @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP DELETE against the API # # Usage: diff --git a/bin/bencrypt b/bin/bencrypt index 0377240a..0edd160f 100755 --- a/bin/bencrypt +++ b/bin/bencrypt @@ -1,4 +1,7 @@ #!/bin/bash +# +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# SCRIPT="${0}" SCRIPT_DIR=$(cd $(dirname ${SCRIPT}) && pwd) . ${SCRIPT_DIR}/bubble_common diff --git a/bin/bget b/bin/bget index 858caabf..1c136318 100755 --- a/bin/bget +++ b/bin/bget @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP GET against the API # # Usage: diff --git a/bin/bgeti b/bin/bgeti index 04a4e9d9..a1fc0fe3 100755 --- a/bin/bgeti +++ b/bin/bgeti @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP GET against the API, then print out the "uuid" attribute only # # Usage: diff --git a/bin/bgeti1 b/bin/bgeti1 index 1074d563..b910b55b 100755 --- a/bin/bgeti1 +++ b/bin/bgeti1 @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP GET against the API, then print out the "uuid" attribute only, and only the first one # # Usage: diff --git a/bin/bgetn b/bin/bgetn index 2c22f1f6..cdd41f37 100755 --- a/bin/bgetn +++ b/bin/bgetn @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP GET against the API, then print out the "name" attribute only # # Usage: diff --git a/bin/bgetn1 b/bin/bgetn1 index bdb05a6f..dd3db881 100755 --- a/bin/bgetn1 +++ b/bin/bgetn1 @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP GET against the API, then print out the "name" attribute only, and only the first one # # Usage: diff --git a/bin/bmodel b/bin/bmodel index 64d83d29..0ac68fd9 100755 --- a/bin/bmodel +++ b/bin/bmodel @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Write a model to a bubble server # # Usage: model [-u/--update-all] model-file diff --git a/bin/bpatch b/bin/bpatch index 4249bbc1..0cd99276 100755 --- a/bin/bpatch +++ b/bin/bpatch @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Usage: # # bpatch hostname diff --git a/bin/bpatchfull b/bin/bpatchfull index aba211d7..fbe32c09 100755 --- a/bin/bpatchfull +++ b/bin/bpatchfull @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Usage: # # bpatchfull hostname [norestart] diff --git a/bin/bpost b/bin/bpost index abc374fa..b5447dea 100755 --- a/bin/bpost +++ b/bin/bpost @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP POST against the API # # Usage: diff --git a/bin/bposte b/bin/bposte index 80a52d28..d3462895 100755 --- a/bin/bposte +++ b/bin/bposte @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP POST against the API with an empty request entity # # Usage: diff --git a/bin/bput b/bin/bput index a1651f0b..ac2e5040 100755 --- a/bin/bput +++ b/bin/bput @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP PUT against the API # # Usage: diff --git a/bin/bpute b/bin/bpute index 65b34574..7a6e6c18 100755 --- a/bin/bpute +++ b/bin/bpute @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run an HTTP PUT against the API with an empty request entity # # Usage: diff --git a/bin/bscript b/bin/bscript index 555708a6..5926fd37 100755 --- a/bin/bscript +++ b/bin/bscript @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run a local JSON API script against a remote API server # # Usage: diff --git a/bin/bubble b/bin/bubble index a7214496..c3b6dddd 100755 --- a/bin/bubble +++ b/bin/bubble @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Bubble client script. Wraps the run.sh script. # # Usually not called directly, instead use one of the higher-level wrappers: sync-model, run-script diff --git a/bin/bubble_common b/bin/bubble_common index e0bed01d..b1171bf6 100755 --- a/bin/bubble_common +++ b/bin/bubble_common @@ -1,5 +1,7 @@ #!/bin/bash - +# +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# function die { if [[ -z "${SCRIPT}" ]] ; then echo 1>&2 "${1}" diff --git a/bin/build_dist b/bin/build_dist index 048e5fe6..99416590 100755 --- a/bin/build_dist +++ b/bin/build_dist @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Build Bubble distribution ZIP file # # Usage: diff --git a/bin/bunlock b/bin/bunlock index d36eab02..bbce8a8b 100755 --- a/bin/bunlock +++ b/bin/bunlock @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Unlock a new bubble # # Usage: diff --git a/bin/cleanup_bubble_databases b/bin/cleanup_bubble_databases index 71319f86..175ed961 100755 --- a/bin/cleanup_bubble_databases +++ b/bin/cleanup_bubble_databases @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Drop the various temporary databases that sometimes get left around by the tests # Do not run this command while tests are running # diff --git a/bin/create_user_and_network b/bin/create_user_and_network index 009e4a58..b3d415ec 100755 --- a/bin/create_user_and_network +++ b/bin/create_user_and_network @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Create a new user and start a network for that user # # Usage: create_user_and_network diff --git a/bin/first_time_setup.sh b/bin/first_time_setup.sh index a8d7aff6..7edf6488 100755 --- a/bin/first_time_setup.sh +++ b/bin/first_time_setup.sh @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Performs first-time setup after a fresh git clone. # Installs utility libraries. # diff --git a/bin/first_time_ubuntu.sh b/bin/first_time_ubuntu.sh index 6319fb5d..ddf97b25 100755 --- a/bin/first_time_ubuntu.sh +++ b/bin/first_time_ubuntu.sh @@ -1,5 +1,7 @@ #!/bin/bash - +# +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# function die { echo 1>&2 "${1}" exit 1 diff --git a/bin/git_update_bubble.sh b/bin/git_update_bubble.sh index 1ca90ad3..70a5d9d2 100755 --- a/bin/git_update_bubble.sh +++ b/bin/git_update_bubble.sh @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Update repository from master, including submodules, and rebuild bubble jar file # # Usage: diff --git a/bin/jq-all-vals b/bin/jq-all-vals index 00fbc684..342718f5 100755 --- a/bin/jq-all-vals +++ b/bin/jq-all-vals @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Print all values for a JSON property name, among any given JSON via stdin. # JSON could be object, array, nested objects, etc. # diff --git a/bin/list_bubble_databases b/bin/list_bubble_databases index 508c16f4..f7d86079 100755 --- a/bin/list_bubble_databases +++ b/bin/list_bubble_databases @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # List bubble databases # # Usage: diff --git a/bin/new_bubble.sh b/bin/new_bubble.sh index f2e19e19..fb53ecec 100755 --- a/bin/new_bubble.sh +++ b/bin/new_bubble.sh @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Launch a new bubble from a sage node # # Usage: new_bubble.sh config-file diff --git a/bin/prep_bubble_jar b/bin/prep_bubble_jar index a77b43b6..a28b59f4 100755 --- a/bin/prep_bubble_jar +++ b/bin/prep_bubble_jar @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Prepares the bubble.jar file for active usage. # # 1. Update role JSON in bubble-server/src/main/resources/ansible/default_roles.json diff --git a/bin/proxy b/bin/proxy index 98840b26..8aaee16f 100755 --- a/bin/proxy +++ b/bin/proxy @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Request a URL via the reverse proxy # # Usage: proxy url outfile diff --git a/bin/reset_bubble_db b/bin/reset_bubble_db index 1e8620dd..ead30acc 100755 --- a/bin/reset_bubble_db +++ b/bin/reset_bubble_db @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Reset the local "bubble" database # # Usage: reset_bubble_db [debug] diff --git a/bin/run.sh b/bin/run.sh index dc834fab..787e8ec5 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Run Bubble server or CLI commands. A wrapper for starting a JVM to run Bubble programs. # # Usage: run.sh [debug [debug-port]] [command] [args] diff --git a/bin/update_role b/bin/update_role index 1b62e536..593b0baf 100755 --- a/bin/update_role +++ b/bin/update_role @@ -1,5 +1,8 @@ #!/bin/bash # +# Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://git.bubblev.org/bubblev/bubble/src/branch/master/LICENSE.md +# +# # Update a role on a remote node # # Usage: diff --git a/bubble-server/pom.xml b/bubble-server/pom.xml index 2cb1fa3c..d8b967a8 100644 --- a/bubble-server/pom.xml +++ b/bubble-server/pom.xml @@ -1,11 +1,6 @@ - + diff --git a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties index 551f70b5..3089f34f 100644 --- a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties +++ b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties @@ -1 +1 @@ -bubble.version=0.9.0 +bubble.version=0.9.1 diff --git a/pom.xml b/pom.xml index 15571904..544394ff 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,6 @@ - + 4.0.0 diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils index 33a9e0d0..6cc7a8a2 160000 --- a/utils/cobbzilla-utils +++ b/utils/cobbzilla-utils @@ -1 +1 @@ -Subproject commit 33a9e0d000f2def25fd0ae5fd92aaa2ae6e4cf71 +Subproject commit 6cc7a8a279ebb90edbfd8ec379acb5a52acad522