epm play: use universal script for repacking snaps

repack.d/generic-snap.sh

+#!/bin/sh -x
+# It will run with two args: buildroot spec
+BUILDROOT="$1"
+SPEC="$2"
+
+PRODUCT="$(grep "^Name: " $SPEC | sed -e "s|Name: ||g" | head -n1)"
+PRODUCTDIR=/opt/$PRODUCT
+
+. $(dirname $0)/common.sh
+
+cd .$PRODUCTDIR || fatal
+
+# Workaround for plex
+for i in usr/lib/x86_64-linux-gnu/libwebp* ; do
+    move_file $PRODUCTDIR/$i $PRODUCTDIR/lib/$(basename $i)
+done
+
+for i in  data-dir gnome-platform scripts lib/dri usr etc meta snap ; do
+    remove_dir $PRODUCTDIR/$i
+done
+
+for i in libEGL.so.1 libdrm.so.2 libdrm_amdgpu.so.1 libva-drm.so.2 libva-x11.so.2 libva.so.2 libcom_err.so.2 libdbus-1.so.3 libexpat.so.1 libkeyutils.so.1 ; do
+    remove_file $PRODUCTDIR/lib/$i
+done
+
+for i in command.sh desktop-common.sh desktop-gnome-specific.sh desktop-init.sh ; do
+    remove_file $PRODUCTDIR/$i
+done
+
+cd >/dev/null

repack.d/penpot-desktop.sh

@@ -8,18 +8,6 @@ SPEC="$2"
 
 add_bin_exec_command
 
-cd .$PRODUCTDIR || fatal
-
-for i in data-dir gnome-platform lib meta scripts usr ; do
-    remove_dir $PRODUCTDIR/$i
-done
-
-for i in *.sh ; do
-    remove_file $PRODUCTDIR/$i
-done
-
-cd >/dev/null
-
 add_libs_requires
 
 add_bin_link_command

repack.d/plex-desktop.sh

@@ -8,21 +8,4 @@ SPEC="$2"
 
 add_bin_link_command $PRODUCT $PRODUCTDIR/Plex.sh
 
-
-cd .$PRODUCTDIR || fatal
-
-for i in usr/lib/x86_64-linux-gnu/libwebp* ; do
-    move_file $PRODUCTDIR/$i $PRODUCTDIR/lib/$(basename $i)
-done
-
-for i in etc meta snap lib/dri usr/bin usr/lib usr/include usr/share/X11 usr/share/misc usr/share/doc usr/share/fonts ; do
-    remove_dir $PRODUCTDIR/$i
-done
-
-for i in libEGL.so.1 libdrm.so.2 libdrm_amdgpu.so.1 libva-drm.so.2 libva-x11.so.2 libva.so.2 ; do
-    remove_file $PRODUCTDIR/lib/$i
-done
-
-cd >/dev/null
-
 add_libs_requires

repack.d/raindrop.sh

@@ -8,16 +8,4 @@ SPEC="$2"
 
 add_bin_exec_command
 
-cd .$PRODUCTDIR || fatal
-
-for i in data-dir gnome-platform lib meta scripts usr ; do
-    remove_dir $PRODUCTDIR/$i
-done
-
-for i in *.sh ; do
-    remove_file $PRODUCTDIR/$i
-done
-
-cd >/dev/null
-
 add_libs_requires

repack.d/singularityapp.sh

@@ -9,36 +9,7 @@ SPEC="$2"
 add_bin_exec_command $PRODUCT
 cat <<EOF >$BUILDROOT/usr/bin/$PRODUCT
 #!/bin/sh
-LD_LIBRARY_PATH=$PRODUCTDIR/$PRODUCT/lib/x86_64-linux-gnu exec $PRODUCTDIR/$PRODUCT --disable-gpu --no-sandbox "\$@"
+exec $PRODUCTDIR/$PRODUCT --disable-gpu --no-sandbox "\$@"
 EOF
 
-cd .$PRODUCTDIR || fatal
-
-# just remove all libs
-remove_dir usr/lib/x86_64-linux-gnu
-#for i in usr/lib/x86_64-linux-gnu/* ; do
-#    move_file $PRODUCTDIR/$i $PRODUCTDIR/lib/x86_64-linux-gnu/$(basename $i)
-#done
-
-for i in etc meta snap lib/dri usr/bin usr/lib usr/include usr/share/X11 usr/share/misc usr/share/doc usr/share/fonts ; do
-    remove_dir $PRODUCTDIR/$i
-done
-
-#for i in libEGL.so.1 libdrm.so.2 libdrm_amdgpu.so.1 libva-drm.so.2 libva-x11.so.2 libva.so.2 ; do
-#    remove_file $PRODUCTDIR/lib/x86_64-linux-gnu/$i
-#done
-
-for i in libcom_err.so.2 libdbus-1.so.3 libexpat.so.1 libkeyutils.so.1 ; do
-    remove_file $PRODUCTDIR/lib/x86_64-linux-gnu/$i
-done
-
-# remove embedded libnss
-#for i in libfreebl3.so libfreeblpriv3.so libnspr4.so libnss3.so libnssutil3.so libplc4.so libplds4.so libsmime3.so libssl3.so nss ; do
-#    remove_file $PRODUCTDIR/lib/x86_64-linux-gnu/$i
-#done
-
-#libappindicator3.so.1 libappindicator3.so.1.0.0 libdbusmenu-glib.so.4 libdbusmenu-glib.so.4.0.12 libdbusmenu-gtk3.so.4 libdbusmenu-gtk3.so.4.0.12 libindicator3.so.7 libindicator3.so.7.0.0
-
-cd >/dev/null
-
 add_libs_requires

repack.d/tradingview.sh

@@ -11,14 +11,6 @@ add_bin_exec_command
 # as in upstream's command.sh
 subst 's|"$@"|--no-sandbox "$@"|' usr/bin/$PRODUCT
 
-cd .$PRODUCTDIR || fatal
-
-for i in etc meta snap lib/dri usr/bin usr/lib usr/include usr/share/X11 usr/share/misc usr/share/doc usr/share/fonts ; do
-    remove_dir $PRODUCTDIR/$i
-done
-
-cd >/dev/null
-
 #fix_chrome_sandbox
 
 add_libs_requires