Changed the XDG folder from Hammond to hammond, Added make tar.

This commit is contained in:
Jordan Petridis 2017-11-10 14:09:05 +02:00
parent acd2f1411e
commit fe571df1d5
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
3 changed files with 14 additions and 7 deletions

View File

@ -2,7 +2,6 @@
# https://github.com/mmstick/tv-renamer/blob/3f9e274e1b2300209172d4b3c991e9e7952b7259/Makefile # https://github.com/mmstick/tv-renamer/blob/3f9e274e1b2300209172d4b3c991e9e7952b7259/Makefile
DESTDIR = /usr DESTDIR = /usr
version = $(shell awk 'NR == 3 {print substr($$3, 2, length($$3)-2)}' Cargo.toml)
all: all:
cargo build --release cargo build --release
@ -14,6 +13,15 @@ install:
install -Dm 644 README.md "${DESTDIR}/share/doc/hammond/README" install -Dm 644 README.md "${DESTDIR}/share/doc/hammond/README"
install -Dm 644 LICENSE "${DESTDIR}/share/licenses/hammond/COPYING" install -Dm 644 LICENSE "${DESTDIR}/share/licenses/hammond/COPYING"
tar:
install -Dm 755 "target/release/hammond-gtk" "hammond/bin/hammond"
ln -sf "hammond/bin/hammond" "hammond/bin/hammond-gtk"
install -Dm 644 "assets/hammond.desktop" "hammond/share/applications/hammond.desktop"
install -Dm 644 README.md "hammond/share/doc/hammond/README"
install -Dm 644 LICENSE "hammond/share/licenses/hammond/COPYING"
tar cf - "hammond" | xz -zf > "hammond_$(shell uname -m).tar.xz"
rm -rf hammond
uninstall: uninstall:
rm "${DESTDIR}/bin/hammond" rm "${DESTDIR}/bin/hammond"
rm "${DESTDIR}/bin/hammond-gtk" rm "${DESTDIR}/bin/hammond-gtk"

View File

@ -21,8 +21,7 @@ cargo run -p hammond-gtk --release
```sh ```sh
git clone https://gitlab.gnome.org/alatiera/hammond.git git clone https://gitlab.gnome.org/alatiera/hammond.git
cd Hammond/ cd Hammond/
make make && sudo make install
sudo make install
``` ```
**Additionall:** **Additionall:**
@ -68,14 +67,14 @@ $ tree -d
├── assets # png's used in the README.md ├── assets # png's used in the README.md
├── hammond-data # Storate related stuff, Sqlite db, XDG setup. ├── hammond-data # Storate related stuff, Sqlite db, XDG setup.
│   ├── migrations # Diesel migrations. │   ├── migrations # Diesel migrations.
│   │   └── ... │   │   └── ...
│   ├── src │   ├── src
│   └── tests │   └── tests
│   └── feeds # Raw RSS Feeds used for tests. │   └── feeds # Raw RSS Feeds used for tests.
├── hammond-downloader # Really basic, Really crappy downloader. ├── hammond-downloader # Really basic, Really crappy downloader.
│   └── src │   └── src
├── hammond-gtk # The Gtk+ Client ├── hammond-gtk # The Gtk+ Client
│   ├── resources # GResources folder │   ├── resources # GResources folder
│   │   └── gtk # Contains the glade.ui files. │   │   └── gtk # Contains the glade.ui files.
│   └── src │   └── src
│   ├── views # Currently only contains the Podcasts_view. │   ├── views # Currently only contains the Podcasts_view.

View File

@ -39,7 +39,7 @@ embed_migrations!("migrations/");
lazy_static!{ lazy_static!{
#[allow(dead_code)] #[allow(dead_code)]
static ref HAMMOND_XDG: xdg::BaseDirectories = { static ref HAMMOND_XDG: xdg::BaseDirectories = {
xdg::BaseDirectories::with_prefix("Hammond").unwrap() xdg::BaseDirectories::with_prefix("hammond").unwrap()
}; };
static ref _HAMMOND_DATA: PathBuf = { static ref _HAMMOND_DATA: PathBuf = {