diff --git a/client-py3/full/linux/Makefile b/client-py3/full/linux/Makefile index 15101af8..796a679f 100644 --- a/client-py3/full/linux/Makefile +++ b/client-py3/full/linux/Makefile @@ -43,7 +43,9 @@ ifeq ($(DISTRO),targz) tar czvf ../udsclient-$(VERSION).tar.gz -C $(DESTDIR) . endif - +ifeq ($(DISTRO),rh) +endif + # chmod 0755 $(BINDIR)/udsclient uninstall: rm -rf $(LIBDIR) diff --git a/client-py3/full/linux/build-packages.sh b/client-py3/full/linux/build-packages.sh index 950e021d..0fb93a6f 100755 --- a/client-py3/full/linux/build-packages.sh +++ b/client-py3/full/linux/build-packages.sh @@ -13,15 +13,14 @@ cat udsclient-template.spec | sed -e s/"release 1"/"release ${RELEASE}"/g > udsclient-$VERSION.spec # Now fix dependencies for opensuse -cat udsclient-template.spec | - sed -e s/"version 0.0.0"/"version ${VERSION}"/g | - sed -e s/"name udsclient"/"name udsclient-opensuse"/g | - sed -e s/"PyQt4"/"python-qt4"/g | - sed -e s/"libXScrnSaver"/"libXss1"/g > udsclient-opensuse-$VERSION.spec - +# Note: Right now, opensuse & rh seems to have same dependencies, only 1 package needed +# cat udsclient-template.spec | +# sed -e s/"version 0.0.0"/"version ${VERSION}"/g | +# sed -e s/"name udsclient3"/"name udsclient3-opensuse"/g > udsclient-opensuse-$VERSION.spec # Right now, udsactor-xrdp-.spec is not needed -for pkg in udsclient-$VERSION.spec udsclient-opensuse-$VERSION.spec; do +# for pkg in udsclient-$VERSION.spec udsclient-opensuse-$VERSION.spec; do +for pkg in udsclient-$VERSION.spec; do rm -rf rpm for folder in SOURCES BUILD RPMS SPECS SRPMS; do diff --git a/client-py3/full/linux/installer.sh b/client-py3/full/linux/installer.sh index a2e93b17..9968d074 100644 --- a/client-py3/full/linux/installer.sh +++ b/client-py3/full/linux/installer.sh @@ -1,14 +1,13 @@ #!/bin/sh cp -r usr/lib/UDSClient /usr/lib/UDSClient -cp -r usr/share/applications /usr/lib/applications -R +cp -r usr/share/applications /usr/share/applications -R update-desktop-database echo "Installation process done." echo "Remembar that the following packages must be installed on system:" -echo "* Python paramiko" -echo "* Python pyqt4" +echo "* Python3 paramiko" +echo "* Python3 pyqt4" +echo "* Python3 requests" echo "Theese packages (as their names), are dependent on your platform, so you must locate and install them" -echo "You can install them directly on any platform with pip, using this simple command: " -echo "pip install PyQt4 paramiko" - +echo "Also, ensure that a /media folder exists on your machine, that will be redirected on RDP connections" \ No newline at end of file diff --git a/client-py3/full/linux/udsclient-template.spec b/client-py3/full/linux/udsclient-template.spec index 752a0a5a..cea9e930 100644 --- a/client-py3/full/linux/udsclient-template.spec +++ b/client-py3/full/linux/udsclient-template.spec @@ -1,5 +1,5 @@ %define _topdir %(echo $PWD)/rpm -%define name udsclient +%define name udsclient3 %define version 0.0.0 %define release 1 %define buildroot %{_topdir}/%{name}-%{version}-%{release}-root @@ -28,6 +28,7 @@ cd $curdir %post /usr/bin/update-desktop-database +if [ ! -d /media ]; then mkdir /media; echo "/media created for compatibility"; fi %clean rm -rf $RPM_BUILD_ROOT