diff --git a/Makefile b/Makefile index 731f861..f4fd4ca 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ .PHONY: jsonedit.phar -jsonedit.phar: +jsonedit.phar: composer echo " \"v$(shell git describe --tags)\", 'builddate' => \"$(shell LC_ALL=C date)\" ];" > src/build.php \ && box compile \ && rm src/build.php \ && mv bin/jsonedit.phar . - +.PHONY: composer +composer: + test -d vendor || composer install diff --git a/README.md b/README.md index 7d4ea97..79069d0 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,8 @@ This is an editor for JSON files, that also supports YAML. - Makes use of Unicode glyphs in 16 magnificent colors! - Handles array, objects and values - Folding of array and object keys -- Core edit operations: insert, edit, delete +- Core edit operations: insert, edit, delete, duplicate - A minimum of dependencies -- ~300KB executable PHAR ![screenshot](./doc/screens/main.png) @@ -24,17 +23,17 @@ This is an editor for JSON files, that also supports YAML. The recommended way to install and run JSONEdit is by grabbing the PHAR from the latest release: -- [https://dev.noccylabs.info/noccy/jsonedit/releases](https://dev.noccylabs.info/noccy/jsonedit/releases) +- [https://dev.noccylabs.info/jsonedit/jsonedit/releases](https://dev.noccylabs.info/jsonedit/jsonedit/releases) You can also clone the respository and use [Box](https://box-project.github.io/box/) -to build the .phar yourself: +to build the .phar yourself. The recommended way of doing this is with the included +`Makefile` and GNU Make: ```bash -$ git clone https://dev.noccylabs.info/noccy/jsonedit +$ git clone https://dev.noccylabs.info/jsonedit/jsonedit $ cd jsonedit -$ composer install -$ box compile -$ mv bin/jsonedit.phar ~/bin/jsonedit +$ make +$ mv jsonedit.phar ~/bin/jsonedit ``` ## Using