epm play rustdesk: skip nighttly downloading, rewrite repack

play.d/rustdesk.sh

@@ -23,6 +23,12 @@ fi
 
 PKGURL=$(eget --list --latest https://github.com/rustdesk/rustdesk/releases "$MASK")
 
+# 
+if [ "$VERSION" = "*" ] && echo "$PKGURL" | grep -q "nightly" ; then
+    echo "Skipping nightly $PKGURL ..."
+    PKGURL=$(eget --list --second-latest https://github.com/rustdesk/rustdesk/releases "$MASK")
+fi
+
 install_pkgurl
 
 cat <<EOF

repack.d/rustdesk.sh

@@ -4,59 +4,17 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-PRODUCT=rustdesk
-# FIXME: move 1.2.0 to /opt
-PRODUCTDIR=/usr/lib/$PRODUCT
-
 . $(dirname $0)/common.sh
 
 # put service file to the normal place
-mkdir -p $BUILDROOT/etc/systemd/system/
-cp $BUILDROOT/usr/share/rustdesk/files/systemd/rustdesk.service $BUILDROOT/etc/systemd/system/$PRODUCT.service
+install_file usr/share/rustdesk/files/systemd/rustdesk.service /etc/systemd/system/$PRODUCT.service
 remove_dir /usr/share/rustdesk/files/systemd
-pack_file /etc/systemd/system/$PRODUCT.service
 
 VERSION=$(grep "^Version:" $SPEC | sed -e "s|Version: ||")
+
 if [ "$VERSION" = "1.1.8" ] || [ "$VERSION" = "1.1.9" ] ; then
 echo "Note: use 1.1.x compatibility script"
-echo "Categories=GNOME;GTK;Network;RemoteAccess;" >> $BUILDROOT/usr/share/applications/$PRODUCT.desktop
-
-# thread 'main' panicked at 'error: 'libsciter-gtk.so' was not found neither in PATH nor near the current executable.
-#move_to_opt /usr/lib/rustdesk
-#mv $BUILDROOT/usr/bin/$PRODUCT $BUILDROOT/$PRODUCTDIR
-#pack_file $PRODUCTDIR/$PRODUCT
-#add_bin_exec_command
-#remove_dir /usr/lib
-
-# Works without this
-#epm assure patchelf || fatal
-#for i in $BUILDROOT/usr/bin/$PRODUCT ; do
-#    a= patchelf --set-rpath '$PRODUCTDIR' $i || continue
-#done
-
-else
-
-#### 1.2.0 and above
-subst "s|^Categories.*|Categories=GNOME;GTK;Network;RemoteAccess;|" $BUILDROOT/usr/share/applications/$PRODUCT.desktop
-subst "s|/usr/share/rustdesk/files/rustdesk.png|$PRODUCT|" $BUILDROOT/usr/share/applications/$PRODUCT.desktop
-
-if [ -f $BUILDROOT/usr/share/rustdesk/files/rustdesk.png ] ; then
-    ICONFILE=$PRODUCT.png
-    install_file /usr/share/rustdesk/files/rustdesk.png /usr/share/pixmaps/$ICONFILE
-fi
-
-#move_to_opt /usr/lib/rustdesk
-add_bin_link_command
-
-if epm assure patchelf ; then
-for i in $BUILDROOT/$PRODUCTDIR/lib/*.so ; do
-    a= patchelf --set-rpath '$ORIGIN/' $i || continue
-done
-fi
-
-filter_from_requires /etc/X11/xinit/Xsession /etc/default/locale /usr/etc/X11/xdm/Xsession
-
-fi
+echo "Categories=GNOME;GTK;Network;RemoteAccess;" >> usr/share/applications/$PRODUCT.desktop
 
 add_libs_requires
 
@@ -74,3 +32,15 @@ if ! epm install --skip-installed --no-remove python3-module-pynput ; then
 fi
 
 exit
+fi
+
+#### 1.2.3 and above
+
+move_to_opt /usr/lib/rustdesk
+
+subst "s|^Categories.*|Categories=GNOME;GTK;Network;RemoteAccess;|" usr/share/applications/$PRODUCT.desktop
+
+add_bin_link_command
+
+add_unirequires curl
+add_libs_requires