Skip to content

Commit

Permalink
rename non-intuitive generate subcommand to build, update examples
Browse files Browse the repository at this point in the history
  • Loading branch information
rholder committed Mar 22, 2016
1 parent 30ade6e commit 3f5a825
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions debinate
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -o errexit
set -o pipefail

readonly DEBINATE_VERSION=0.4.0
readonly DEBINATE_VERSION=0.5.0
readonly PROVISIONING=.debinate
readonly DEBINATE_BUILD=${PROVISIONING}/build
readonly DEBINATE_TARGET=${PROVISIONING}/target
Expand Down Expand Up @@ -49,7 +49,7 @@ Python:
Advanced:
debinate generate - build a .deb from a directory
debinate build - build a .deb from a directory
-r, --root root directory, e.g. ./root with ./root/usr/local/bin/thing inside
-n, --name project name (optional, default: current directory)
-v, --version project version (optional, default: 1.0.0)
Expand All @@ -64,10 +64,10 @@ Examples:
debinate clean
# minimal default to build a .deb from the given root directory
debinate generate -r ./build/root
debinate build -r ./build/root
# kitchen sink, specify all the things!
debinate generate --root ./build/root --name potato --version 1.3.2 --debian-dir ./debian --output ./potato-123.deb
debinate build --root ./build/root --name potato --version 1.3.2 --debian-dir ./debian --output ./potato-123.deb
You can find the latest version and file bugs at https://github.com/rholder/debinate.
Expand Down Expand Up @@ -276,8 +276,8 @@ function add_trailing_slash () {
echo "${the_value}"
}

# parse commandline arguments and generate a Debian package archive
function generate_cli () {
# parse commandline arguments and build a Debian package archive from a directory
function build_cli () {
# required, will fail if empty
local deb_root=

Expand Down Expand Up @@ -516,9 +516,9 @@ function main () {
package_python
generate_deb_for_python "${PROJECT_NAME}" "${VERSION}" "${VENDOR}" "${PROVISIONING}" "${DEBINATE_BUILD}/${PROJECT_NAME}-${VERSION}.deb"
;;
generate)
build)
shift 1
generate_cli "$@"
build_cli "$@"
;;
*)
usage
Expand Down
2 changes: 1 addition & 1 deletion examples/foo-everything/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ build:
@echo Build successful.

package: build
@debinate generate --root $(BUILD_DIR)/root/ --output $(BUILD_DIR)/$(NAME)-$(VERSION)-all.deb --debian-dir debian
@debinate build --root $(BUILD_DIR)/root/ --output $(BUILD_DIR)/$(NAME)-$(VERSION)-all.deb --debian-dir debian
@echo Package successful.
2 changes: 1 addition & 1 deletion examples/foo-minimal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ build:
@echo Build successful.

package: build
@debinate generate --root $(BUILD_DIR)/root/ --version $(VERSION) --output $(BUILD_DIR)/$(NAME)-$(VERSION)-all.deb
@debinate build --root $(BUILD_DIR)/root/ --version $(VERSION) --output $(BUILD_DIR)/$(NAME)-$(VERSION)-all.deb
@echo Package successful.

0 comments on commit 3f5a825

Please sign in to comment.