diff options
| author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
|---|---|---|
| committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
| commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
| tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /docker/init.sh | |
| parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
| parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
| download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 | |
Merge branch 'master' into better_inventory
Conflicts:
README
data/templates/products/entry.html
docker/Dockerfile
docker/init.sh
src/database/database.vala
src/database/db-interface.vala
src/pdf-stock/Makefile
src/pdf-stock/pdf-stock-interface.vala
src/pdf-stock/pdf-stock.vala
src/web/Makefile
src/web/main.vala
templates/menu.html
templates/products/index.html
Diffstat (limited to 'docker/init.sh')
| -rwxr-xr-x | docker/init.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docker/init.sh b/docker/init.sh index 49a3aa1..bcd6f6b 100755 --- a/docker/init.sh +++ b/docker/init.sh @@ -1,13 +1,9 @@ #!/bin/bash -cd dbus -make install -cd config -make install - export LD_LIBRARY_PATH=/mnt/serial-barcode-scanner/libcairobarcode -cd ../.. dbus-daemon --system -echo "Ready!" -tmux +dpkg-buildpackage -b -nc && \ + apt install -y --no-install-recommends ./../shopsystem_*_amd64.deb && \ + cp /root/config.ini /etc/shopsystem/config.ini && \ + tmux |