From 151b9f5761eba7626cbaad5f309eb4001c30882d Mon Sep 17 00:00:00 2001 From: 996icu <48942249+996icu@users.noreply.github.com> Date: Sat, 30 Mar 2019 01:17:00 +0800 Subject: [PATCH 1/5] Update LICENSE --- licenses[WIP]/LICENSE | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/licenses[WIP]/LICENSE b/licenses[WIP]/LICENSE index a6e44e0..900327a 100644 --- a/licenses[WIP]/LICENSE +++ b/licenses[WIP]/LICENSE @@ -1,8 +1,13 @@ The 996ICU License (996ICU) -Copyright © 2019 -996ICU clause: the source code is not permitted to use at 996ICU (9am-9pm, 6 days a week) style work environment. +(The Local Labor Protection Article) +PACKAGE is distributed under LICENSE with the following restriction: -It is recommended to use as a clause of common open source license, such as MIT, BSD, GNU. +The above license is only granted to entities that act in concordance +with local labor laws. In addition, the following requirements must be +observed: -https://github.com/996icu/996.ICU/pull/15642 +* The licencee must not, explicitly or implicitly, request or schedule + their employees to work more than 45 hours in any single week. +* The licencee must not, explicitly or implicitly, request or schedule + their employees to be at work consecutively for 10 hours. From 361cbb37b6f3ee688f682e4bb89969e6cfc7d0c3 Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Sat, 30 Mar 2019 01:28:22 +0800 Subject: [PATCH 2/5] make license name international recognizable. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d4be50..891d9df 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The name `996.ICU` refers to **'Work by "996", sick in ICU'**, an ironic saying among Chinese programmers, which means that by following the "996" work schedule, you are risking yourself getting into ICU (Intensive Care Unit). - + Repo for counting stars and contributing. Press F to pay your respect to honorable developers. From 39751cb4a12f76e53585049a921991ceb866e361 Mon Sep 17 00:00:00 2001 From: 996icu Date: Sat, 30 Mar 2019 01:51:50 +0800 Subject: [PATCH 3/5] UPDATE LICENSE --- licenses[WIP]/LICENSE => LICENSE | 4 ++-- {licenses[WIP] => archived/licenses[WIP]}/LICENSE-MIT-996 | 0 .../licenses[WIP]}/LICENSE.996icu.en-US | 0 .../licenses[WIP]}/LICENSE.996icu.zh-hans | 0 .../licenses[WIP]}/LICENSE_Apache_no_overtime | 0 .../licenses[WIP]/tools}/gen-license/.gitignore | 0 {tools => archived/licenses[WIP]/tools}/gen-license/LICENSE | 0 .../licenses[WIP]/tools}/gen-license/MANIFEST.in | 0 {tools => archived/licenses[WIP]/tools}/gen-license/Makefile | 0 .../licenses[WIP]/tools}/gen-license/README.md | 0 {tools => archived/licenses[WIP]/tools}/gen-license/debug.py | 0 .../licenses[WIP]/tools}/gen-license/genlicense/__init__.py | 0 .../genlicense/licenses/996.icu.template.zh-cn.txt | 0 .../tools}/gen-license/genlicense/licenses/agpl-3.0.txt | 0 .../tools}/gen-license/genlicense/licenses/apache-2.0.txt | 0 .../tools}/gen-license/genlicense/licenses/bsd-2-clause.txt | 0 .../tools}/gen-license/genlicense/licenses/bsd-3-clause.txt | 0 .../tools}/gen-license/genlicense/licenses/epl-2.0.txt | 0 .../tools}/gen-license/genlicense/licenses/gpl-2.0.txt | 0 .../tools}/gen-license/genlicense/licenses/gpl-3.0.txt | 0 .../tools}/gen-license/genlicense/licenses/lgpl-2.1.txt | 0 .../tools}/gen-license/genlicense/licenses/lgpl-3.0.txt | 0 .../tools}/gen-license/genlicense/licenses/mit.txt | 0 .../tools}/gen-license/genlicense/licenses/mpl-2.0.txt | 0 .../tools}/gen-license/genlicense/licenses/unlicenses.txt | 0 {tools => archived/licenses[WIP]/tools}/gen-license/setup.py | 0 licenses[WIP]/projects_supporting_996_LICENSE.md | 5 ----- 27 files changed, 2 insertions(+), 7 deletions(-) rename licenses[WIP]/LICENSE => LICENSE (84%) rename {licenses[WIP] => archived/licenses[WIP]}/LICENSE-MIT-996 (100%) rename {licenses[WIP] => archived/licenses[WIP]}/LICENSE.996icu.en-US (100%) rename {licenses[WIP] => archived/licenses[WIP]}/LICENSE.996icu.zh-hans (100%) rename {licenses[WIP] => archived/licenses[WIP]}/LICENSE_Apache_no_overtime (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/.gitignore (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/LICENSE (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/MANIFEST.in (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/Makefile (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/README.md (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/debug.py (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/__init__.py (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/996.icu.template.zh-cn.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/agpl-3.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/apache-2.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/bsd-2-clause.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/bsd-3-clause.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/epl-2.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/gpl-2.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/gpl-3.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/lgpl-2.1.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/lgpl-3.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/mit.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/mpl-2.0.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/genlicense/licenses/unlicenses.txt (100%) rename {tools => archived/licenses[WIP]/tools}/gen-license/setup.py (100%) delete mode 100644 licenses[WIP]/projects_supporting_996_LICENSE.md diff --git a/licenses[WIP]/LICENSE b/LICENSE similarity index 84% rename from licenses[WIP]/LICENSE rename to LICENSE index 900327a..b3a00b1 100644 --- a/licenses[WIP]/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -The 996ICU License (996ICU) + The 996ICU License (996ICU) + Version 0.1, March 2019 -(The Local Labor Protection Article) PACKAGE is distributed under LICENSE with the following restriction: The above license is only granted to entities that act in concordance diff --git a/licenses[WIP]/LICENSE-MIT-996 b/archived/licenses[WIP]/LICENSE-MIT-996 similarity index 100% rename from licenses[WIP]/LICENSE-MIT-996 rename to archived/licenses[WIP]/LICENSE-MIT-996 diff --git a/licenses[WIP]/LICENSE.996icu.en-US b/archived/licenses[WIP]/LICENSE.996icu.en-US similarity index 100% rename from licenses[WIP]/LICENSE.996icu.en-US rename to archived/licenses[WIP]/LICENSE.996icu.en-US diff --git a/licenses[WIP]/LICENSE.996icu.zh-hans b/archived/licenses[WIP]/LICENSE.996icu.zh-hans similarity index 100% rename from licenses[WIP]/LICENSE.996icu.zh-hans rename to archived/licenses[WIP]/LICENSE.996icu.zh-hans diff --git a/licenses[WIP]/LICENSE_Apache_no_overtime b/archived/licenses[WIP]/LICENSE_Apache_no_overtime similarity index 100% rename from licenses[WIP]/LICENSE_Apache_no_overtime rename to archived/licenses[WIP]/LICENSE_Apache_no_overtime diff --git a/tools/gen-license/.gitignore b/archived/licenses[WIP]/tools/gen-license/.gitignore similarity index 100% rename from tools/gen-license/.gitignore rename to archived/licenses[WIP]/tools/gen-license/.gitignore diff --git a/tools/gen-license/LICENSE b/archived/licenses[WIP]/tools/gen-license/LICENSE similarity index 100% rename from tools/gen-license/LICENSE rename to archived/licenses[WIP]/tools/gen-license/LICENSE diff --git a/tools/gen-license/MANIFEST.in b/archived/licenses[WIP]/tools/gen-license/MANIFEST.in similarity index 100% rename from tools/gen-license/MANIFEST.in rename to archived/licenses[WIP]/tools/gen-license/MANIFEST.in diff --git a/tools/gen-license/Makefile b/archived/licenses[WIP]/tools/gen-license/Makefile similarity index 100% rename from tools/gen-license/Makefile rename to archived/licenses[WIP]/tools/gen-license/Makefile diff --git a/tools/gen-license/README.md b/archived/licenses[WIP]/tools/gen-license/README.md similarity index 100% rename from tools/gen-license/README.md rename to archived/licenses[WIP]/tools/gen-license/README.md diff --git a/tools/gen-license/debug.py b/archived/licenses[WIP]/tools/gen-license/debug.py similarity index 100% rename from tools/gen-license/debug.py rename to archived/licenses[WIP]/tools/gen-license/debug.py diff --git a/tools/gen-license/genlicense/__init__.py b/archived/licenses[WIP]/tools/gen-license/genlicense/__init__.py similarity index 100% rename from tools/gen-license/genlicense/__init__.py rename to archived/licenses[WIP]/tools/gen-license/genlicense/__init__.py diff --git a/tools/gen-license/genlicense/licenses/996.icu.template.zh-cn.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/996.icu.template.zh-cn.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/996.icu.template.zh-cn.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/996.icu.template.zh-cn.txt diff --git a/tools/gen-license/genlicense/licenses/agpl-3.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/agpl-3.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/agpl-3.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/agpl-3.0.txt diff --git a/tools/gen-license/genlicense/licenses/apache-2.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/apache-2.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/apache-2.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/apache-2.0.txt diff --git a/tools/gen-license/genlicense/licenses/bsd-2-clause.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/bsd-2-clause.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/bsd-2-clause.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/bsd-2-clause.txt diff --git a/tools/gen-license/genlicense/licenses/bsd-3-clause.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/bsd-3-clause.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/bsd-3-clause.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/bsd-3-clause.txt diff --git a/tools/gen-license/genlicense/licenses/epl-2.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/epl-2.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/epl-2.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/epl-2.0.txt diff --git a/tools/gen-license/genlicense/licenses/gpl-2.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/gpl-2.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/gpl-2.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/gpl-2.0.txt diff --git a/tools/gen-license/genlicense/licenses/gpl-3.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/gpl-3.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/gpl-3.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/gpl-3.0.txt diff --git a/tools/gen-license/genlicense/licenses/lgpl-2.1.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/lgpl-2.1.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/lgpl-2.1.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/lgpl-2.1.txt diff --git a/tools/gen-license/genlicense/licenses/lgpl-3.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/lgpl-3.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/lgpl-3.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/lgpl-3.0.txt diff --git a/tools/gen-license/genlicense/licenses/mit.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/mit.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/mit.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/mit.txt diff --git a/tools/gen-license/genlicense/licenses/mpl-2.0.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/mpl-2.0.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/mpl-2.0.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/mpl-2.0.txt diff --git a/tools/gen-license/genlicense/licenses/unlicenses.txt b/archived/licenses[WIP]/tools/gen-license/genlicense/licenses/unlicenses.txt similarity index 100% rename from tools/gen-license/genlicense/licenses/unlicenses.txt rename to archived/licenses[WIP]/tools/gen-license/genlicense/licenses/unlicenses.txt diff --git a/tools/gen-license/setup.py b/archived/licenses[WIP]/tools/gen-license/setup.py similarity index 100% rename from tools/gen-license/setup.py rename to archived/licenses[WIP]/tools/gen-license/setup.py diff --git a/licenses[WIP]/projects_supporting_996_LICENSE.md b/licenses[WIP]/projects_supporting_996_LICENSE.md deleted file mode 100644 index ef09b04..0000000 --- a/licenses[WIP]/projects_supporting_996_LICENSE.md +++ /dev/null @@ -1,5 +0,0 @@ -This document includes projects supporting 996ICU flavoured licenses: - -Project Name | Description | Link | License ---- | --- | --- | --- -wx-ble | 微信小程序设备点对点蓝牙通讯最佳实践 | https://github.com/vuchan/wx-ble | MIT with 996ICU From 6baeeb54eda813aa5864bda6333f1da6ee7df8fc Mon Sep 17 00:00:00 2001 From: 996icu Date: Sat, 30 Mar 2019 01:54:49 +0800 Subject: [PATCH 4/5] UPDATE README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0d4be50..d3d945c 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Community powers - [996.TSC](https://github.com/lxlxw/996.TSC) is a repo that designed to let more people know and join the activity of the 996.ICU. - An [anonymous vote page](externals/exposure.md) shows a rank list of 996 (or more) companies. (Thanks to @LinXueyuanStdio) - + Where are the issues? --- Even if with the interaction limits on, the issue area was totally lost of control. @@ -39,7 +39,8 @@ So I **personally** decided to switch it off, not by GitHub or others. License --- -[996ICU Licenses](https://github.com/996icu/996.ICU/blob/master/licenses%5BWIP%5D/)[WIP] -See [#15642](https://github.com/996icu/996.ICU/pull/15642) for more details. - -If you want to update licenses, please edit [this template](https://github.com/996icu/996.ICU/blob/master/tools/gen-license/genlicense/licenses/996.icu.template.zh-cn.txt) which used by [this tool](https://github.com/996icu/996.ICU/blob/master/tools/gen-license/) to help with generate LICENSE files. +[996ICU License](https://github.com/996icu/996.ICU/blob/master/LICENSE/) +It's an idea of @xushunke: **Design A Software License Of Labor Protection -- 996ICU License** +It's source are from @Artoria2e5, +See [#15642](https://github.com/996icu/996.ICU/pull/15642) for more details. +This license should be used with other licenses as a practice of multi-licensing. From 7fb16854ed5df64774d4d1f6f0cb8ea6df5d7b77 Mon Sep 17 00:00:00 2001 From: 996icu <48942249+996icu@users.noreply.github.com> Date: Sat, 30 Mar 2019 02:05:07 +0800 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75f0bd1..d57a5e8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The name `996.ICU` refers to **'Work by "996", sick in ICU'**, an ironic saying among Chinese programmers, which means that by following the "996" work schedule, you are risking yourself getting into ICU (Intensive Care Unit). - + Repo for counting stars and contributing. Press F to pay your respect to honorable developers.