play.d: cleanup scripts

play.d/discord.sh

@@ -7,8 +7,6 @@ DESCRIPTION="Discord from the official site"
 . $(dirname $0)/common.sh
 
 
-
-# curl can't get filename: https://github.com/curl/curl/issues/8461
-epm assure wget
+epm assure wget || fatal "Can't install wget, but curl can't get filename: https://github.com/curl/curl/issues/8461"
 epm install "https://discord.com/api/download?platform=linux&format=deb"
 

play.d/snap4arduino.sh

@@ -4,12 +4,6 @@ PKGNAME=snap4arduino
 SUPPORTEDARCHES="x86_64 x86"
 DESCRIPTION="Snap4Arduino binds Snap! and Arduino together"
 
-if [ "$1" = "--remove" ] ; then
-    # $PKGNAME-stable really
-    epm remove $(epmqp $PKGNAME)
-    exit
-fi
-
 . $(dirname $0)/common.sh
 
 arch=$($DISTRVENDOR --distro-arch)

play.d/zoom.sh

@@ -7,7 +7,6 @@ DESCRIPTION="Zoom client from the official site"
 . $(dirname $0)/common.sh
 
 
-repack='--repack'
 arch=$($DISTRVENDOR --distro-arch)
 case $arch in
     x86_64|amd64)
@@ -22,7 +21,7 @@ case $arch in
 esac
 
 if [ "$($DISTRVENDOR -s)" = "alt" ] ; then
-    epm install $repack https://zoom.us/client/$version/zoom_$arch.rpm
+    epm install --repack https://zoom.us/client/$version/zoom_$arch.rpm
     exit
 fi
 

repack.d/atom-beta.sh

@@ -22,7 +22,8 @@ subst '1i%add_python3_path /usr/share/atom-beta' $SPEC
 
 # replace embedded git with standalone (due Can't locate Git/LoadCPAN/Error.pm)
 EMBDIR=/usr/share/atom-beta/resources/app.asar.unpacked/node_modules/dugite/git
-rm -rv $BUILDROOT$EMBDIR/
+echo "Removing $BUILDROOT$EMBDIR/ ..."
+rm -r $BUILDROOT$EMBDIR/
 mkdir -p $BUILDROOT$EMBDIR/bin/
 ln -s /usr/bin/git $BUILDROOT$EMBDIR/bin/git
 subst "s|.*$EMBDIR/libexec/.*||" $SPEC
@@ -31,7 +32,8 @@ subst "s|.*$EMBDIR/ssl/.*||" $SPEC
 
 # replace embedded npm with standalone
 EMBDIR=/usr/share/atom-beta/resources/app/apm/node_modules/npm
-rm -rv $BUILDROOT$EMBDIR/
+echo "Removing $BUILDROOT$EMBDIR/ ..."
+rm -r $BUILDROOT$EMBDIR/
 ln -s /usr/lib/node_modules/npm $BUILDROOT$EMBDIR
 subst "s|.*$EMBDIR/..*\"||" $SPEC