Update htop-appimage.sh

Author: Samueru-sama

htop-appimage.sh

@@ -1,41 +1,40 @@
 #!/bin/sh
 
 APP=htop
+APPDIR="$APP".AppDir
 SITE="htop-dev/htop"
 
 # CREATE DIRECTORIES
 if [ -z "$APP" ]; then exit 1; fi
-mkdir -p "./$APP/tmp" "./$APP/src" "./$APP/$APP.AppDir/usr/bin" && cd "./$APP/tmp" || exit 1
+mkdir -p ./"$APP/$APPDIR" && cd ./"$APP/$APPDIR" || exit 1
 
 # DOWNLOAD AND BUILD HTOP
-version=$(wget -q https://api.github.com/repos/$SITE/releases -O - | grep browser_download_url | grep -i tar.xz | cut -d '"' -f 4 | head -1)
-wget "$version" && tar fx ./*tar* && cd .. && mv --backup=t ./tmp/*/* ./src
-cd ./src && ./autogen.sh && ./configure && make || exit 1
+CURRENTDIR="$(readlink -f "$(dirname "$0")")" # DO NOT MOVE THIS
+version=$(wget -q https://api.github.com/repos/$SITE/releases -O - | sed 's/[()",{}]/ /g; s/ /\n/g' | grep -o 'https.*releases.*htop.*tar.xz' | head -1)
+wget "$version" && tar fx ./*tar* && cd ./htop* && ./autogen.sh && ./configure --prefix="$CURRENTDIR" && make && make install && cd .. && rm -rf ./htop* ./*tar* || exit 1
 
 # PREPARE APPIMAGE
-cd .. && mv ./src/htop "./$APP.AppDir/usr/bin" && mv ./src/*.png "./$APP.AppDir/$APP.png" && mv ./src/*.desktop "./$APP.AppDir/$APP.desktop"
-cd "./$APP.AppDir" && ln -s "./$APP.png" ./.DirIcon || exit 1
+cp ./share/applications/*.desktop ./ && cp ./share/icons/*/*/*/* ./htop.svg && ln -s ./htop.svg ./.DirIcon || exit 1
 
 # AppRun
 cat >> ./AppRun << 'EOF'
 #!/bin/sh
 CURRENTDIR="$(readlink -f "$(dirname "$0")")"
-exec "$CURRENTDIR/usr/bin/htop" "$@"
+"$CURRENTDIR/bin/htop" "$@"
 EOF
 chmod a+x ./AppRun
 
+APPVERSION=$(./AppRun -V)
+if [ -z "$APPVERSION" ]; then echo "Failed to get version from zenity"; exit 1; fi
+
 # MAKE APPIMAGE
 cd ..
 APPIMAGETOOL=$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/"/ /g; s/ /\n/g' | grep -o 'https.*continuous.*tool.*86_64.*mage$')
 wget -q "$APPIMAGETOOL" -O ./appimagetool && chmod a+x ./appimagetool
 
 # Do the thing!
-ARCH=x86_64 VERSION=$(./appimagetool -v | grep -o '[[:digit:]]*') ./appimagetool -s ./$APP.AppDir
+ARCH=x86_64 VERSION="$APPVERSION" ./appimagetool -s ./"$APPDIR"
 ls ./*.AppImage || { echo "appimagetool failed to make the appimage"; exit 1; }
-
-APPNAME=$(ls *AppImage)
-APPVERSION=$(echo $version | awk -F / '{print $(NF-1)}')
-mv ./*AppImage ./"$APPVERSION"-"$APPNAME"
 if [ -z "$APP" ]; then exit 1; fi # Being extra safe lol
 mv ./*.AppImage .. && cd .. && rm -rf "./$APP"
 echo "All Done!"