Browse Source

more fixes

drone
Claudio Luck 8 months ago
parent
commit
20470e33e6
4 changed files with 26 additions and 9 deletions
  1. +15
    -3
      GNUmakefile
  2. +1
    -1
      contrib/pEp/ImportFromEnigmail
  3. +1
    -1
      pEp_Thunderbird_Setup.desktop
  4. +9
    -4
      plat/lnx/pEp_install.sh

+ 15
- 3
GNUmakefile View File

@ -33,6 +33,7 @@ DISTDIR := dist/$(VARIANT)-$(OS)-$(PLAT)-$(VERSION)
SETUPDIR := $(DISTDIR)/pEp_Setup_Thunderbird/.Setup
bundle_zip := dist/pEp_Setup_Thunderbird_$(BUNDLE_VER_TAG).zip
bundle_tgz := dist/pEp_Setup_Thunderbird_$(BUNDLE_VER_TAG).tgz
pEp_import_SRC = $(wildcard contrib/pEp/ImportFromEnigmail/*.py)
@ -58,7 +59,7 @@ DATA_ROOTFILES = pEp_Thunderbird_Setup.desktop
DISTFILES = $(bundle_zip)
all: $(bundle_zip)
all: $(bundle_zip) $(bundle_tgz)
src/tb_setup:
$(MAKE) $(MAKEOPTS) -C src tb_setup
@ -73,7 +74,7 @@ bundle_zip_layout:
$(SETUPDIR):
@mkdir -p $@
$(bundle_zip): $(SETUPDIR) $(bundle_zip_layout) $(bundle_DESTS)
bundle_layout: $(SETUPDIR) $(bundle_zip_layout) $(bundle_DESTS)
sed -i.bak \
-e 's/^X-pEp-MDA-Version=.*$$/X-pEp-MDA-Version=$(VERSION)/' \
-e 's/^X-pEp-MDA-OS=.*$$/X-pEp-MDA-OSn=$(OS)/' \
@ -81,9 +82,20 @@ $(bundle_zip): $(SETUPDIR) $(bundle_zip_layout) $(bundle_DESTS)
-e 's/^X-pEp-MDA-Platform=.*$$/X-pEp-MDA-Platform=$(PLAT)/' \
pEp_Thunderbird_Setup.desktop
@rm -f pEp_Thunderbird_Setup.desktop.bak
zip: $(bundle_zip)
$(bundle_zip): bundle_layout
rm -f ../../$@ ; \
cd $(DISTDIR) ; \
zip -9 -yr ../../$@ pEp_Setup_Thunderbird
tgz: $(bundle_tgz)
$(bundle_tgz): bundle_layout
rm -f ../../$@ ; \
zip -yr ../../$@ pEp_Setup_Thunderbird
cd $(DISTDIR) ; \
tar -czf ../../$@ pEp_Setup_Thunderbird
$(patsubst contrib/pEp/ImportFromEnigmail/%,$(SETUPDIR)/Import/%,$(pEp_import_SRC)):
@mkdir -p $(SETUPDIR)/Import


+ 1
- 1
contrib/pEp/ImportFromEnigmail

@ -1 +1 @@
Subproject commit 3da0ad35a90e0e93029446fb1d3eb9fb95cec7c2
Subproject commit fece83677f4087ca61eb7cb713cc4f822157ddda

+ 1
- 1
pEp_Thunderbird_Setup.desktop View File

@ -22,7 +22,7 @@ GenericName=p≡p Linux Installer for Linux
Comment=Start p≡p Linux Installer for Linux, requires Thunderbird to be installed
Categories=Network;Office;Security;Email;
Icon=mail-replied
Exec=sh -c '.Setup/tb_setup "%k"'
Exec=sh -c '"$(dirname "%k")/.Setup/tb_setup" "%k"'
X-pEp-Exec=.Setup/pEp_install.sh
X-pEp-Import-Exec=.Setup/pEp_import.sh
X-pEp-MDA-Version=2.0.7


+ 9
- 4
plat/lnx/pEp_install.sh View File

@ -48,6 +48,13 @@ _install () {
chmod "$mode" "$dst"
}
_start_adapter () {
_info "Starting the adapter"
if [ ! -e "$HOME/.config/systemd/user/default.target.wants/pEp-mini-json-adapter.service" ] ; then
"$adapter_bin" --no-html &
fi
}
adapter_bin=""
if [ $user_inst -eq 0 ] ; then
adapter_bin="/usr/local/bin/pEp-mini-json-adapter"
@ -84,6 +91,7 @@ if [ $user_inst -eq 0 ] ; then
systemctl --user enable pEp-mini-json-adapter.service
systemctl --user start pEp-mini-json-adapter.service
fi
_start_adapter
fi
else
_section "Install adapter to user profile"
@ -112,10 +120,7 @@ else
else
echo "Warning: /etc/xdg not present, can not install autostart entry" >&2
fi
fi
_info "Starting the adapter"
if [ ! -e "$HOME/.config/systemd/user/default.target.wants/pEp-mini-json-adapter.service" ] ; then
"$adapter_bin" --no-html
_start_adapter
fi
_info "Completed"

Loading…
Cancel
Save