Merge remote-tracking branch 'origin/pr/203'

* origin/pr/203:
  Added "QubesIncoming" shortcut to Nautilus
This commit is contained in:
Marek Marczykowski-Górecki 2020-01-16 04:24:07 +01:00
commit d2087c5abf
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 14 additions and 0 deletions

View File

@ -1 +1,2 @@
usr/share/nautilus-python/extensions/* usr/share/nautilus-python/extensions/*
usr/lib/qubes/qvm_nautilus_bookmark.sh

View File

@ -1,7 +1,9 @@
NAUTILUSPYEXTDIR ?= /usr/share/nautilus-python/extensions NAUTILUSPYEXTDIR ?= /usr/share/nautilus-python/extensions
QUBESLIBDIR ?= /usr/lib/qubes
.PHONY: install .PHONY: install
install: install:
install -d $(DESTDIR)$(NAUTILUSPYEXTDIR) install -d $(DESTDIR)$(NAUTILUSPYEXTDIR)
install -t $(DESTDIR)$(NAUTILUSPYEXTDIR) -m 0644 *.py install -t $(DESTDIR)$(NAUTILUSPYEXTDIR) -m 0644 *.py
install -t $(DESTDIR)$(QUBESLIBDIR) -m 0755 *.sh

View File

@ -0,0 +1,6 @@
#!/bin/sh
if [ ! -e ~/.config/gtk-3.0/qubes-incoming-bookmark-created ]
then
echo "file:///home/user/QubesIncoming" >> ~/.config/gtk-3.0/bookmarks
touch ~/.config/gtk-3.0/qubes-incoming-bookmark-created
fi

View File

@ -1,2 +1,6 @@
#!/bin/sh #!/bin/sh
if [ -f /usr/lib/qubes/qvm_nautilus_bookmark.sh ]
then
/usr/lib/qubes/qvm_nautilus_bookmark.sh >/dev/null 2>&1 </dev/null
fi
exec /usr/lib/qubes/qfile-unpacker exec /usr/lib/qubes/qfile-unpacker

View File

@ -686,6 +686,7 @@ rm -f %{name}-%{version}
/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py* /usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py* /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py* /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
/usr/lib/qubes/qvm_nautilus_bookmark.sh
%files thunar %files thunar
/usr/lib/qubes/qvm-actions.sh /usr/lib/qubes/qvm-actions.sh