Happy new year (a bit late)

paradoxxxzero · Feb 13, 2017 · 729c768 · 729c768
1 parent 17f8c1d
commit 729c768
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 36 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-butterfly Copyright (C) 2015  Florian Mounier, Kozea
+butterfly Copyright(C) 2015-2017 Florian Mounier, Kozea
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ƸӜƷ butterfly 2.0
+# ƸӜƷ butterfly 3.0 (Not released yet)
 
 ![](http://paradoxxxzero.github.io/assets/butterfly_2.0_1.gif)
 
@@ -26,7 +26,8 @@ Butterfly is a xterm compatible terminal that runs in your browser.
 
 ``` bash
 $ pip install butterfly
-$ pip install libsass  # If you want to use themes
+$ pip install butterfly[themes]  # If you want to use themes
+$ pip install butterfly[systemd]  # If you want to use systemd
 $ butterfly
 ```
 
@@ -60,7 +61,8 @@ $ systemctl enable butterfly.socket
 $ systemctl start butterfly.socket
 ```
 
-Don't forget to update the /etc/butterfly/butterfly.conf file with your server options (host, port, shell, ...)
+Don't forget to update the /etc/butterfly/butterfly.conf file with your server options (host, port, shell, ...) and to install butterfly with the [systemd] flag.
+
 
 ## Contribute
 
@@ -84,7 +86,7 @@ The js part is based on [term.js](https://github.com/chjj/term.js/) which is bas
 ## License
 
 ```
-butterfly Copyright (C) 2015  Florian Mounier
+butterfly Copyright (C) 2015-2017  Florian Mounier
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/butterfly.server.py b/butterfly.server.py
@@ -3,7 +3,7 @@
 
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/butterfly/__init__.py b/butterfly/__init__.py
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/butterfly/routes.py b/butterfly/routes.py
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/butterfly/sass/_16_colors.sass b/butterfly/sass/_16_colors.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_256_colors.sass b/butterfly/sass/_256_colors.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_colors.sass b/butterfly/sass/_colors.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_cursor.sass b/butterfly/sass/_cursor.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_font.sass b/butterfly/sass/_font.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_layout.sass b/butterfly/sass/_layout.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_light_fx.sass b/butterfly/sass/_light_fx.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_styles.sass b/butterfly/sass/_styles.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_term_styles.sass b/butterfly/sass/_term_styles.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/_variables.sass b/butterfly/sass/_variables.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/sass/main.sass b/butterfly/sass/main.sass
@@ -1,7 +1,7 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/static/main.css b/butterfly/static/main.css
@@ -1,6 +1,6 @@
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -17,7 +17,7 @@
 /* These a the default variables */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -40,7 +40,7 @@
 /* These are all imported files */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -57,7 +57,7 @@
 /* You can change this file to import any webfont: */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -111,7 +111,7 @@ body {
 /* You can comment / uncomment the following to enable/disable terminal effects. */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -163,7 +163,7 @@ body {
 /* @import all_fx */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -177,7 +177,7 @@ body {
 /* The color theme is defined in this one: */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -351,7 +351,7 @@ body {
 
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -2786,7 +2786,7 @@ body {
 
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -2874,7 +2874,7 @@ body {
 
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */
@@ -2893,7 +2893,7 @@ body {
 
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
-/* butterfly Copyright (C) 2015  Florian Mounier */
+/* butterfly Copyright(C) 2015-2017 Florian Mounier */
 /* This program is free software: you can redistribute it and/or modify */
 /* it under the terms of the GNU General Public License as published by */
 /* the Free Software Foundation, either version 3 of the License, or */

diff --git a/butterfly/terminal.py b/butterfly/terminal.py
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/butterfly/utils.py b/butterfly/utils.py
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/coffees/ext/clipboard.coffee b/coffees/ext/clipboard.coffee
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/coffees/ext/virtual_input.coffee b/coffees/ext/virtual_input.coffee
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/coffees/main.coffee b/coffees/main.coffee
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or

diff --git a/coffees/term.coffee b/coffees/term.coffee
@@ -1,7 +1,7 @@
 # *-* coding: utf-8 *-*
 # This file is part of butterfly
 #
-# butterfly Copyright (C) 2015  Florian Mounier
+# butterfly Copyright(C) 2015-2017 Florian Mounier
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or