From 5604519f5a9f1e46269442a4e430e05f0e84d7a9 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Mon, 22 Feb 2016 13:43:47 -0500 Subject: make the desktop license clear Former-commit-id: ec7a029f609ede442eeb30c802d760d44ccb7b7b --- make_desktop.sh | 1 + www/LICENSE-DESKTOP-CLIENT.txt | 23 ----------------------- www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 www/LICENSE-DESKTOP-CLIENT.txt create mode 100644 www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt diff --git a/make_desktop.sh b/make_desktop.sh index f1048521..ba8942a7 100755 --- a/make_desktop.sh +++ b/make_desktop.sh @@ -23,6 +23,7 @@ if [ -d "$i" ]; then exe mkdir $i/app exe cp -R www/ $i/app exe cp electron_js/* $i/app + exe cp www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt ../$DIRNAME exe cd $i cat app/js/DataModel.js | sed "s/var zmAppVersion=\"unknown\"/var zmAppVersion=\"$APPVER\"/" > app/js/DataModel.js.tmp exe rm -fr app/js/DataModel.js diff --git a/www/LICENSE-DESKTOP-CLIENT.txt b/www/LICENSE-DESKTOP-CLIENT.txt deleted file mode 100644 index 11c8e216..00000000 --- a/www/LICENSE-DESKTOP-CLIENT.txt +++ /dev/null @@ -1,23 +0,0 @@ -The code is free for personal, non commercial use -http://creativecommons.org/licenses/by-nc-sa/4.0/ -In summary: Share Alike, Adapt,Attribute, NonCommercial - -For Desktop Clients: -The Desktop clients are free to download and use ONLY for users -who are using the desktop client with the free and open source ZoneMinder -software. If you are selling a service based on zoneminder and are either distributing the Desktop Client to your users or asking your users to use the desktop client by download it themselves, you are violating the non-commercial use. You will need to procure a license before you do so. - -Be nice, please. - -If you have any questions on licensing feel free to contact me. - -Ninja icon; -https://openclipart.org/detail/172393/ninja-logo -License: https://openclipart.org/share - -Blop sound for notifications: -http://soundbible.com/2067-Blop.html - - --thanks - diff --git a/www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt b/www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt new file mode 100644 index 00000000..11c8e216 --- /dev/null +++ b/www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt @@ -0,0 +1,23 @@ +The code is free for personal, non commercial use +http://creativecommons.org/licenses/by-nc-sa/4.0/ +In summary: Share Alike, Adapt,Attribute, NonCommercial + +For Desktop Clients: +The Desktop clients are free to download and use ONLY for users +who are using the desktop client with the free and open source ZoneMinder +software. If you are selling a service based on zoneminder and are either distributing the Desktop Client to your users or asking your users to use the desktop client by download it themselves, you are violating the non-commercial use. You will need to procure a license before you do so. + +Be nice, please. + +If you have any questions on licensing feel free to contact me. + +Ninja icon; +https://openclipart.org/detail/172393/ninja-logo +License: https://openclipart.org/share + +Blop sound for notifications: +http://soundbible.com/2067-Blop.html + + +-thanks + -- cgit v1.2.3