diff --git a/Makefile b/Makefile index 09ad83f..8990143 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,11 @@ sysconfdir = /etc sbindir = ${exec_prefix}/sbin bindir = ${exec_prefix}/bin datadir = ${prefix}/share +ifeq ($(ARCH), x86_64) +libexecdir = ${prefix}/libexec64 +else +libexecdir = ${prefix}/libexec +endif initrddir = ${sysconfdir}/rc.d/init.d mandir = ${prefix}/usr/share/man sysconfigdir= ${sysconfdir}/sysconfig @@ -91,6 +96,7 @@ pck_infiles := $(wildcard kde/config/*.in \ kde/wallpapers/*.in \ menu/*.in menu/applications/*.in menu/applications/*/*.in \ SRPMS/*/*.in \ + remote-support-mambasoft/*.in \ desktop/*.in) pck_sysconfigfile := distroutils.sysconfig @@ -118,6 +124,7 @@ pck_catalogs3 := $(wildcard openmamba-update/po/*.po) s,@sysconfigfile@,$(SYSCONFIGFILE),g;\ s,@datadir@,${datadir},g;\ s,@bindir@,$(bindir),g;\ + s,@libexecdir@,$(libexecdir),g;\ s,@distrobindir@,$(distrobindir),g;\ s,@distrodesktopdir@,$(distrodesktopdir),g;\ s,@distrosrpmsdir@,$(distrosrpmsdir),g;\ @@ -232,6 +239,7 @@ install-icons: @for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \ $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \ $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \ + $(INSTALL_DATA) remote-support-mambasoft/mambasoft-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambasoft.png; \ done ifeq ($(WITHKDE3TOOLS),1) @for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \ @@ -275,6 +283,10 @@ ifeq ($(WITHKDE3TOOLS),1) $(INSTALL_DATA) mambawelcome/mambawelcome.target $(DESTDIR)$(systemdsystemdir)/mambawelcome.target endif +install-remote-support-mambasoft: + $(INSTALL_SCRIPT) remote-support-mambasoft/remote-support-mambasoft.sh $(DESTDIR)$(bindir)/remote-support-mambasoft + $(INSTALL_DATA) remote-support-mambasoft/remote-support-mambasoft.desktop $(DESTDIR)$(xdg_appsdir) + install-xramdr: @$(INSTALL_DIR) $(DESTDIR)$(xramdrdatadir) $(INSTALL_SCRIPT) xramdr/70521-xramdr.kmdr $(DESTDIR)$(xramdrdatadir)/xramdr.kmdr @@ -307,6 +319,7 @@ install: $(pck_infiles:.in=) \ install-mambabase \ install-mambawelcome \ install-mambareport \ + install-remote-support-mambasoft \ install-bootrecover \ install-locales \ install-icons diff --git a/remote-support-mambasoft/mambasoft-128x128.png b/remote-support-mambasoft/mambasoft-128x128.png new file mode 100644 index 0000000..dff7adc Binary files /dev/null and b/remote-support-mambasoft/mambasoft-128x128.png differ diff --git a/remote-support-mambasoft/mambasoft-16x16.png b/remote-support-mambasoft/mambasoft-16x16.png new file mode 100644 index 0000000..452bd63 Binary files /dev/null and b/remote-support-mambasoft/mambasoft-16x16.png differ diff --git a/remote-support-mambasoft/mambasoft-22x22.png b/remote-support-mambasoft/mambasoft-22x22.png new file mode 100644 index 0000000..01480f3 Binary files /dev/null and b/remote-support-mambasoft/mambasoft-22x22.png differ diff --git a/remote-support-mambasoft/mambasoft-32x32.png b/remote-support-mambasoft/mambasoft-32x32.png new file mode 100644 index 0000000..6c5c750 Binary files /dev/null and b/remote-support-mambasoft/mambasoft-32x32.png differ diff --git a/remote-support-mambasoft/mambasoft-48x48.png b/remote-support-mambasoft/mambasoft-48x48.png new file mode 100644 index 0000000..0a9833f Binary files /dev/null and b/remote-support-mambasoft/mambasoft-48x48.png differ diff --git a/remote-support-mambasoft/mambasoft-64x64.png b/remote-support-mambasoft/mambasoft-64x64.png new file mode 100644 index 0000000..7aa0b42 Binary files /dev/null and b/remote-support-mambasoft/mambasoft-64x64.png differ diff --git a/remote-support-mambasoft/remote-support-mambasoft.desktop b/remote-support-mambasoft/remote-support-mambasoft.desktop new file mode 100644 index 0000000..c99ad24 --- /dev/null +++ b/remote-support-mambasoft/remote-support-mambasoft.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=mambaSoft remote support +Name[it]=Supporto remoto mambaSoft +GenericName=Remote assistance +GenericName[it]=Assistenza remota +Exec=/usr/bin/remote-support-mambasoft < /dev/null +Icon=mambasoft +Terminal=0 +Type=Application +Categories=X-openmamba; diff --git a/remote-support-mambasoft/remote-support-mambasoft.sh.in b/remote-support-mambasoft/remote-support-mambasoft.sh.in new file mode 100755 index 0000000..e2ba9e3 --- /dev/null +++ b/remote-support-mambasoft/remote-support-mambasoft.sh.in @@ -0,0 +1,3 @@ +#!/bin/bash +export SSH_ASKPASS=@libexecdir@/openssh/ssh-askpass +ssh -p 4424 -N -R 45678:localhost:22 assistenza@services.mambasoft.it