From 1dce2c74e3932cfa5e2ab741ad9a00882e4a3dce Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 21 Oct 2016 16:19:12 +1100 Subject: [PATCH] Build 2.3.1 --- build.sh | 8 ++++---- changelog.txt | 4 ++++ dist/addon.xml | 2 +- dist/lang/en/app-changelog.html | 4 ++++ dist/lang/en/app-readme.html | 2 +- package.json | 2 +- readme.md | 4 ++-- src/lang/en/app-changelog.md | 4 ++++ src/lang/en/app-readme.md | 4 ++-- ....3.0.zip => webinterface.default.2.3.1.zip | Bin 3221852 -> 3222632 bytes 10 files changed, 23 insertions(+), 11 deletions(-) rename webinterface.kodi.2.3.0.zip => webinterface.default.2.3.1.zip (98%) diff --git a/build.sh b/build.sh index 6bc42bfb..0aaf9113 100755 --- a/build.sh +++ b/build.sh @@ -18,14 +18,14 @@ grunt build echo "removing old zip and build files" echo "==============================================" -rm webinterface.kodi*.zip +rm webinterface.default*.zip rm dist/js/build/*.js echo "Building zip" echo "==============================================" -cp -r ./dist ./webinterface.kodi -zip -r -q webinterface.kodi.$1.zip ./webinterface.kodi -rm -rf ./webinterface.kodi +cp -r ./dist ./webinterface.default +zip -r -q webinterface.default.$1.zip ./webinterface.default +rm -rf ./webinterface.default echo "Build complete" echo "==============================================" diff --git a/changelog.txt b/changelog.txt index 9645fcc3..3f59d79c 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +Version 2.3.1 +------------- +* Changed build script to use webinterface.default + Version 2.3.0 ------------- * Version bump to be greater than current default web interface diff --git a/dist/addon.xml b/dist/addon.xml index 1431c9f4..d982dde2 100755 --- a/dist/addon.xml +++ b/dist/addon.xml @@ -1,7 +1,7 @@ diff --git a/dist/lang/en/app-changelog.html b/dist/lang/en/app-changelog.html index dcf84a15..46a3d2c8 100644 --- a/dist/lang/en/app-changelog.html +++ b/dist/lang/en/app-changelog.html @@ -1,3 +1,7 @@ +

Version 2.3.1

+
    +
  • Changed build script to use webinterface.default
    • +

Version 2.3.0

  • Version bump to be greater than current default web interface
    • diff --git a/dist/lang/en/app-readme.html b/dist/lang/en/app-readme.html index 03dd4c87..9bd4ee46 100644 --- a/dist/lang/en/app-readme.html +++ b/dist/lang/en/app-readme.html @@ -12,7 +12,7 @@

    Current state

    Getting it working

    Disclaimer: Beta software, expect bugs, changes, nuclear war, etc.

    Installing

    -

    Install via zip is the easiest way to go. Grab the zip from the root of this repo then do this

    +

    Install via zip is the easiest way to go. Grab the latest release of webinterface.default.2.X.X.zip from the releases page then install it like this

    Configuring

    • Kodi > System > Settings > Services
      • diff --git a/package.json b/package.json index c292194f..bc260ad9 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kodi-webinterface", - "version": "2.3.0", + "version": "2.3.1", "dependencies": {}, "devDependencies": { "grunt": "~0.4.2", diff --git a/readme.md b/readme.md index c2c85f98..e41e2306 100755 --- a/readme.md +++ b/readme.md @@ -21,7 +21,7 @@ Pretty good, most things work really well. Other things need [polish/finishing/f Disclaimer: Beta software, expect bugs, changes, nuclear war, etc. ### Installing -Install via zip is the easiest way to go. Grab the zip from the root of this repo [then do this](http://kodi.wiki/view/Add-on_manager#How_to_install_from_a_ZIP_file) +Install via zip is the easiest way to go. Grab the latest release of webinterface.default.2.X.X.zip from the [releases page](https://github.com/xbmc/chorus2/releases) then install it [like this](http://kodi.wiki/view/Add-on_manager#How_to_install_from_a_ZIP_file) ### Configuring * Kodi > System > Settings > Services @@ -113,4 +113,4 @@ Are you a fan of Chorus? You can [buy me Jeremy a beer](https://www.paypal.com/c ![alt text](https://raw.githubusercontent.com/xbmc/chorus2/master/dist/screenshots/settings.jpg "Settings") ### Add-ons -![alt text](https://raw.githubusercontent.com/xbmc/chorus2/master/dist/screenshots/addons.jpg "Add-ons") \ No newline at end of file +![alt text](https://raw.githubusercontent.com/xbmc/chorus2/master/dist/screenshots/addons.jpg "Add-ons") diff --git a/src/lang/en/app-changelog.md b/src/lang/en/app-changelog.md index 9645fcc3..3f59d79c 100755 --- a/src/lang/en/app-changelog.md +++ b/src/lang/en/app-changelog.md @@ -1,3 +1,7 @@ +Version 2.3.1 +------------- +* Changed build script to use webinterface.default + Version 2.3.0 ------------- * Version bump to be greater than current default web interface diff --git a/src/lang/en/app-readme.md b/src/lang/en/app-readme.md index c2c85f98..e41e2306 100755 --- a/src/lang/en/app-readme.md +++ b/src/lang/en/app-readme.md @@ -21,7 +21,7 @@ Pretty good, most things work really well. Other things need [polish/finishing/f Disclaimer: Beta software, expect bugs, changes, nuclear war, etc. ### Installing -Install via zip is the easiest way to go. Grab the zip from the root of this repo [then do this](http://kodi.wiki/view/Add-on_manager#How_to_install_from_a_ZIP_file) +Install via zip is the easiest way to go. Grab the latest release of webinterface.default.2.X.X.zip from the [releases page](https://github.com/xbmc/chorus2/releases) then install it [like this](http://kodi.wiki/view/Add-on_manager#How_to_install_from_a_ZIP_file) ### Configuring * Kodi > System > Settings > Services @@ -113,4 +113,4 @@ Are you a fan of Chorus? You can [buy me Jeremy a beer](https://www.paypal.com/c ![alt text](https://raw.githubusercontent.com/xbmc/chorus2/master/dist/screenshots/settings.jpg "Settings") ### Add-ons -![alt text](https://raw.githubusercontent.com/xbmc/chorus2/master/dist/screenshots/addons.jpg "Add-ons") \ No newline at end of file +![alt text](https://raw.githubusercontent.com/xbmc/chorus2/master/dist/screenshots/addons.jpg "Add-ons") diff --git a/webinterface.kodi.2.3.0.zip b/webinterface.default.2.3.1.zip similarity index 98% rename from webinterface.kodi.2.3.0.zip rename to webinterface.default.2.3.1.zip index 6bbca71af888e275db380b8dd39278002d723c55..38ff9da99ab5b5200dcd3f1b976e175c379b84eb 100644 GIT binary patch delta 20743 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