Skip to content

Commit 33eb3c9

Browse files
committed
update docs
1 parent 66dd786 commit 33eb3c9

File tree

3 files changed

+68
-5
lines changed

3 files changed

+68
-5
lines changed

Makefile

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11

2+
NAME = nspire-merge
3+
4+
SHELL = /bin/sh
5+
RM = rm
26
PREFIX ?= /usr/local
37

8+
deps:
9+
pip install Pillow
10+
411
install:
5-
install -Dm755 ./nspire-merge "$(DESTDIR)$(PREFIX)/bin/nspire-merge"
12+
install -Dm755 $(NAME) "$(DESTDIR)$(PREFIX)/bin/$(NAME)"
13+
install -Dm644 $(NAME).1 "$(DESTDIR)$(PREFIX)/share/man/man1/$(NAME).1"
614

715
uninstall:
8-
$(RM) "$(DESTDIR)$(PREFIX)/bin/nspire-merge"
9-
16+
$(RM) "$(DESTDIR)$(PREFIX)/bin/$(NAME)"
17+
$(RM) "$(DESTDIR)$(PREFIX)/share/man/man1/$(NAME).1"

README.md

+20-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# nspire-merge
33

4-
This Python script merges multiple Lua source files and images into one file for
4+
This Python script merges multiple Lua source files and images into one Lua file for
55
TI-Nspire projects.
66

77
This project is inspired by [DaveDuck321](https://github.com/DaveDuck321)'s
@@ -36,5 +36,23 @@ and import images manually.
3636

3737
## Installation
3838

39-
`sudo make install` installs this script to `/usr/local/bin`.
39+
### Requirements
4040

41+
- `PIL` / `Pillow`
42+
43+
Can be installed using `make deps`.
44+
45+
### Installing through the AUR on Arch Linux
46+
47+
This project is available on the AUR as [`nspire-merge`](https://aur.archlinux.org/packages/nspire-merge).
48+
Either install it manually or use an AUR helper of your choice.
49+
50+
### Install using `make`
51+
52+
Install the script to `/usr/local/bin`:
53+
54+
> `sudo make install`
55+
56+
### Uninstalling
57+
58+
`sudo make uninstall` or `sudo rm -vi /usr/local/bin/nspire-merge /usr/local/share/man/man1/nspire-merge`.

nspire-merge.1

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
.TH "nspire-merge" "1"
2+
3+
.SH "NAME"
4+
.PP
5+
nspire-merge - merging multiple Lua source files and images into one Lua file for TI-Nspire projects
6+
7+
.SH "SYNOPSIS"
8+
.PP
9+
shclrz [OPTIONS] [INPUT FILES ...]
10+
11+
.SH "OPTIONS"
12+
.SS "-h, --help"
13+
.PP
14+
Print help.
15+
.SS "--resources [RESOURCES]"
16+
.PP
17+
Load images from this folder (default "res/").
18+
.SS "--out [OUT]
19+
.PP
20+
Specify file to write the output to (default "out.lua").
21+
.SS "--strip"
22+
.PP
23+
Strips blank lines and comments.
24+
.SS "--api-version [API VERSION]"
25+
Specifies API version (default '2.2').
26+
27+
.SH "EXAMPLES"
28+
.SS "nspire-merge --out myproject.lua -- main.lua gui.lua"
29+
.PP
30+
Generates "myproject.lua" from "main.lua" and "gui.lua" (in this order) and images from "res/".
31+
.SS "nspire-merge --api-version 2.1 --strip -- *.lua"
32+
.PP
33+
Generates "out.lua" from all Lua files in the folder, strips all blank lines and comments from it and sets the API version to "2.1".
34+
35+
.SH "AUTHOR"
36+
.PP
37+
alexcoder04 (\fIhttps://github.com/alexcoder04/nspire-merge\fP)

0 commit comments

Comments
 (0)