Skip to content

Commit 764a196

Browse files
committed
Updating to 1.4.0
1 parent f66027e commit 764a196

File tree

5 files changed

+36
-6
lines changed

5 files changed

+36
-6
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ Themes working in **web-greeter** should work also here. All themes shipped with
3333
- gobject-introspection
3434
- liblightdm-gobject
3535
- liblightdm-gobject-dev
36+
- libgirepository1.0-dev
3637
- libcairo2
38+
- libcairo2-dev
3739
- libxcb-dev
3840
- libx11-dev
3941

build.js

+20-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ const ora = require("ora");
1313

1414
let DEST_DIR = "/";
1515
let PREFIX = "/usr";
16+
let INSTALL_ZSH_COMPLETION = true;
17+
let INSTALL_BASH_COMPLETION = true;
1618
let ARCH = process.arch;
1719
let INSTALL_ROOT = path.resolve(__dirname, "./build/unpacked/");
1820
let ASAR_ROOT = path.resolve(__dirname, "./build/nody-asar/");
@@ -44,13 +46,25 @@ let argv = yargs
4446
describe: "Architecture to build for",
4547
default: ARCH,
4648
})
49+
.option("INSTALL_ZSH_COMPLETION", {
50+
type: "boolean",
51+
describe: "Wheter to install zsh completion",
52+
default: INSTALL_ZSH_COMPLETION,
53+
})
54+
.option("INSTALL_BASH_COMPLETION", {
55+
type: "boolean",
56+
describe: "Wheter to install bash completion",
57+
default: INSTALL_BASH_COMPLETION,
58+
})
4759
.help("h")
4860
.alias("h", "help")
4961
.version(false).argv;
5062

5163
DEST_DIR = argv.DEST_DIR;
5264
PREFIX = argv.PREFIX;
5365
ARCH = argv.ARCH;
66+
INSTALL_ZSH_COMPLETION = argv.INSTALL_ZSH_COMPLETION;
67+
INSTALL_BASH_COMPLETION = argv.INSTALL_BASH_COMPLETION;
5468

5569
// Some global variables
5670

@@ -230,8 +244,10 @@ function create_install_root() {
230244
fs.mkdirsSync(xdg_ldm_path, { recursive: true });
231245
fs.mkdirsSync(xgreeters_path, { recursive: true });
232246
fs.mkdirsSync(applications_path, { recursive: true });
233-
if (check_program("bash")) fs.mkdirsSync(bash_c_path, { recursive: true });
234-
if (check_program("zsh")) fs.mkdirsSync(zsh_c_path, { recursive: true });
247+
if (check_program("bash") && INSTALL_BASH_COMPLETION)
248+
fs.mkdirsSync(bash_c_path, { recursive: true });
249+
if (check_program("zsh") && INSTALL_ZSH_COMPLETION)
250+
fs.mkdirsSync(zsh_c_path, { recursive: true });
235251
}
236252

237253
let copies_prepare = [
@@ -267,12 +283,12 @@ let copies_prepare = [
267283

268284
async function prepare_install() {
269285
create_install_root();
270-
if (check_program("bash"))
286+
if (check_program("bash") && INSTALL_BASH_COMPLETION)
271287
copies_prepare.push({
272288
from: "./dist/nody-greeter-bash",
273289
to: path.join(bash_c_path, "nody-greeter"),
274290
});
275-
if (check_program("zsh"))
291+
if (check_program("zsh") && INSTALL_ZSH_COMPLETION)
276292
copies_prepare.push({
277293
from: "./dist/nody-greeter-zsh",
278294
to: path.join(zsh_c_path, "_nody-greeter"),

build/DEBIAN/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: nody-greeter
2-
Version: 1.3.0
2+
Version: 1.4.0
33
Provides: lightdm-greeter
44
Replaces: lightdm-webkit-greeter
55
Section: x11

make.js

+12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const yargs = require("yargs");
44

55
let DEST_DIR = "/";
66
let PREFIX = "/usr";
7+
let INSTALL_ZSH_COMPLETION = true;
8+
let INSTALL_BASH_COMPLETION = true;
79
let ARCH = process.arch;
810
let INSTALL_ROOT = path.resolve(__dirname, "./build/unpacked/");
911

@@ -38,6 +40,16 @@ let argv = yargs
3840
describe: "Architecture to build for",
3941
default: ARCH,
4042
})
43+
.option("INSTALL_ZSH_COMPLETION", {
44+
type: "boolean",
45+
describe: "Wheter to install zsh completion",
46+
default: INSTALL_ZSH_COMPLETION,
47+
})
48+
.option("INSTALL_BASH_COMPLETION", {
49+
type: "boolean",
50+
describe: "Wheter to install bash completion",
51+
default: INSTALL_BASH_COMPLETION,
52+
})
4153
.help("h")
4254
.alias("h", "help")
4355
.version(false).argv;

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nody-greeter",
3-
"version": "1.3.2",
3+
"version": "1.4.0",
44
"description": "Node.js (electron) greeter for LightDM",
55
"main": "js/index.js",
66
"scripts": {

0 commit comments

Comments
 (0)