Merge pull request #32 from ltworf/rename_command

Change the command name
This commit is contained in:
Salvo 'LtWorf' Tomaselli 2020-08-24 10:48:47 +02:00 committed by GitHub
commit e8abacd005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 16 deletions

View File

@ -29,7 +29,7 @@ deb-pkg: dist
cp -r debian /tmp/relational/ cp -r debian /tmp/relational/
cd /tmp/relational/; dpkg-buildpackage --changes-option=-S cd /tmp/relational/; dpkg-buildpackage --changes-option=-S
mkdir deb-pkg mkdir deb-pkg
mv /tmp/relational_* /tmp/python3-relational_*.deb deb-pkg mv /tmp/relational* /tmp/python3-relational_*.deb deb-pkg
$(RM) -r /tmp/relational $(RM) -r /tmp/relational
.PHONY: dist .PHONY: dist
@ -41,14 +41,15 @@ dist: clean
rm -rf /tmp/relational/windows rm -rf /tmp/relational/windows
rm -rf /tmp/relational/debian/ rm -rf /tmp/relational/debian/
#mv /tmp/relational /tmp/relational-`./relational_gui.py -v | grep Relational | cut -d" " -f2` #mv /tmp/relational /tmp/relational-`./relational.py -v | grep Relational | cut -d" " -f2`
#(cd /tmp; tar -zcf relational.tar.gz relational-*/) #(cd /tmp; tar -zcf relational.tar.gz relational-*/)
(cd /tmp; tar -zcf relational.tar.gz relational/) (cd /tmp; tar -zcf relational.tar.gz relational/)
mv /tmp/relational.tar.gz ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz mv /tmp/relational.tar.gz ./relational_`./relational.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz
gpg --sign --armor --detach-sign ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz gpg --sign --armor --detach-sign ./relational_`./relational.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz
.PHONY: clean .PHONY: clean
clean: clean:
$(RM) -r deb-pkg
rm -rf `find -name "*~"` rm -rf `find -name "*~"`
rm -rf `find -name "*pyc"` rm -rf `find -name "*pyc"`
rm -rf `find -name "*pyo"` rm -rf `find -name "*pyo"`
@ -66,7 +67,7 @@ clean:
install-relational-cli: install-relational-cli:
python3 setup/relational-cli.setup.py install --root=$${DESTDIR:-/}; python3 setup/relational-cli.setup.py install --root=$${DESTDIR:-/};
rm -rf build; rm -rf build;
install -D relational_gui.py $${DESTDIR:-/}/usr/bin/relational-cli install -D relational.py $${DESTDIR:-/}/usr/bin/relational-cli
install -D relational-cli.1 $${DESTDIR:-/}/usr/share/man/man1/relational-cli.1 install -D relational-cli.1 $${DESTDIR:-/}/usr/share/man/man1/relational-cli.1
.PHONY: install-python3-relational .PHONY: install-python3-relational
@ -78,7 +79,7 @@ install-python3-relational:
install-relational: install-relational:
python3 setup/relational.setup.py install --root=$${DESTDIR:-/}; python3 setup/relational.setup.py install --root=$${DESTDIR:-/};
rm -rf build; rm -rf build;
install -D relational_gui.py $${DESTDIR:-/}/usr/bin/relational install -D relational.py $${DESTDIR:-/}/usr/bin/relational
install -m0644 -D relational.desktop $${DESTDIR:-/}/usr/share/applications/relational.desktop install -m0644 -D relational.desktop $${DESTDIR:-/}/usr/share/applications/relational.desktop
install -m0644 -D relational_gui/resources/relational.png $${DESTDIR:-/}/usr/share/pixmaps/relational.png install -m0644 -D relational_gui/resources/relational.png $${DESTDIR:-/}/usr/share/pixmaps/relational.png
install -D relational.1 $${DESTDIR:-/}/usr/share/man/man1/relational.1 install -D relational.1 $${DESTDIR:-/}/usr/share/man/man1/relational.1

View File

@ -54,11 +54,5 @@ to generate some .py files.
To launch the application, run To launch the application, run
``` ```
./relational_gui.py ./relational.py
```
or
```
python3 relational_gui.py
``` ```

View File

@ -27,7 +27,7 @@ version = "3.0"
def printver(exit=True): def printver(exit=True):
print ("Relational %s" % version) print ("Relational %s" % version)
print ("Copyright (C) 2008-2017 Salvo 'LtWorf' Tomaselli.") print ("Copyright (C) 2008-2020 Salvo 'LtWorf' Tomaselli.")
print () print ()
print ("This program comes with ABSOLUTELY NO WARRANTY.") print ("This program comes with ABSOLUTELY NO WARRANTY.")
print ("This is free software, and you are welcome to redistribute it") print ("This is free software, and you are welcome to redistribute it")

View File

@ -1,5 +1,5 @@
# Relational # Relational
# Copyright (C) 2008-2017 Salvo "LtWorf" Tomaselli # Copyright (C) 2008-2020 Salvo "LtWorf" Tomaselli
# #
# Relational is free software: you can redistribute it and/or modify # Relational is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

View File

@ -48,7 +48,7 @@ setup(
}, },
windows=[ windows=[
{ {
"script": "relational_gui.py", "script": "relational.py",
"icon_resources": [(0, "windows/favicon.ico")], "icon_resources": [(0, "windows/favicon.ico")],
} }
], ],