Revert "Add nekos submodule"

This reverts commit 5cadb17f82.

I removed the repo, see
https://github.com/proprdev/nekofetch/issues/10#issuecomment-907532827

.github/workflows/integration.yml

@@ -15,20 +15,20 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch:
+          - amd64
+          - iphoneos-arm
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Build debs
-      run: make debs
+    - name: Build deb
+      run: make ${{ matrix.arch }}deb
 
-    - name: Upload iphoneos-arm deb as artifact
+    - name: Upload deb as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: iphoneos-arm-deb
-        path: com.propr.nekofetch*iphoneos-arm.deb
-    - name: Upload amd64 deb as artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: amd64-deb
-        path: nekofetch*amd64.deb
+        name: ${{ matrix.arch }}-deb
+        path: "*nekofetch*.deb"

Makefile

@@ -7,37 +7,42 @@ PREFIX  ?= /usr
 all:
 	@echo "Nekofetch doesn't need to be compiled, run 'make install' to install"
 
-debs: options iosdeb amd64deb
+debs: options iphoneos-armdeb amd64deb
+
+debroots: options iphoneos-armdebroot amd64debroot
+
+controls: options iphoneos-armcontrol amd64control
 
 options:
 	@echo "VERSION: $(VERSION)"
 
 install:
-	mkdir -p $(PREFIX)/bin
-	install -m 0755 nekofetch $(PREFIX)/bin/nekofetch
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	install -m 0755 nekofetch $(DESTDIR)$(PREFIX)/bin/nekofetch
 	@echo "You may need to install jq, jp2a, and neofetch"
+	@echo "imagemagick is also required to use the kitty image backend"
 
 uninstall:
-	rm -f $(PREFIX)/bin/nekofetch
+	rm -f $(DESTDIR)$(PREFIX)/bin/nekofetch
 
-ioscontrol:
-	cp control.template ioscontrol
-	sed -i 's/PACKAGE/com.propr.nekofetch/' ioscontrol
-	sed -i 's/ARCH/iphoneos-arm/' ioscontrol
-	sed -i 's/VERSION/$(VERSION)/' ioscontrol
+iphoneos-armcontrol:
+	cp control.template iphoneos-armcontrol
+	sed -i 's/PACKAGE/com.propr.nekofetch/' iphoneos-armcontrol
+	sed -i 's/ARCH/iphoneos-arm/' iphoneos-armcontrol
+	sed -i 's/VERSION/$(VERSION)/' iphoneos-armcontrol
 amd64control:
 	cp control.template amd64control
 	sed -i 's/PACKAGE/nekofetch/' amd64control
 	sed -i 's/ARCH/amd64/' amd64control
 	sed -i 's/VERSION/$(VERSION)/' amd64control
 
-iosdebroot: ioscontrol
-	mkdir -p iosdebroot/DEBIAN
-	mkdir -p iosdebroot/usr/bin
-	mkdir -p iosdebroot/usr/share/doc/nekofetch
-	cp ioscontrol iosdebroot/DEBIAN/control
-	cp LICENSE iosdebroot/usr/share/doc/nekofetch/copyright
-	cp nekofetch iosdebroot/usr/bin/nekofetch
+iphoneos-armdebroot: iphoneos-armcontrol
+	mkdir -p iphoneos-armdebroot/DEBIAN
+	mkdir -p iphoneos-armdebroot/usr/bin
+	mkdir -p iphoneos-armdebroot/usr/share/doc/nekofetch
+	cp iphoneos-armcontrol iphoneos-armdebroot/DEBIAN/control
+	cp LICENSE iphoneos-armdebroot/usr/share/doc/nekofetch/copyright
+	cp nekofetch iphoneos-armdebroot/usr/bin/nekofetch
 amd64debroot: amd64control
 	mkdir -p amd64debroot/DEBIAN
 	mkdir -p amd64debroot/usr/bin
@@ -46,14 +51,14 @@ amd64debroot: amd64control
 	cp LICENSE amd64debroot/usr/share/doc/nekofetch/copyright
 	cp nekofetch amd64debroot/usr/bin/nekofetch
 
-iosdeb: iosdebroot
-	dpkg-deb -b "iosdebroot" "com.propr.nekofetch_$(VERSION)_iphoneos-arm.deb"
+iphoneos-armdeb: iphoneos-armdebroot
+	dpkg-deb -b "iphoneos-armdebroot" "com.propr.nekofetch_$(VERSION)_iphoneos-arm.deb"
 amd64deb: amd64debroot
 	dpkg-deb -b "amd64debroot" "nekofetch_$(VERSION)_amd64.deb"
 
 clean:
-	rm -rf iosdebroot amd64debroot
-	rm -f ioscontrol amd64control
+	rm -rf iphoneos-armdebroot amd64debroot
+	rm -f iphoneos-armcontrol amd64control
 	rm -f com.propr.nekofetch_*_iphoneos-arm.deb nekofetch_*_amd64.deb
 
-.PHONY: all debs options install uninstall clean iosdeb amd64deb
+.PHONY: all debs debroots controls options install uninstall iphoneos-armdeb amd64deb clean

control.template

@@ -2,5 +2,6 @@ Package: PACKAGE
 Architecture: ARCH
 Version: VERSION
 Depends: curl, jq, jp2a, neofetch
+Recommends: imagemagick
 Description: neofetch but with nekos
 Maintainer: bbaovanc <bbaovanc@bbaovanc.com>

nekofetch

@@ -1,33 +1,132 @@
 #!/bin/sh
 
-tmpfile="$(mktemp -p /tmp nekofetchXXXXXXXX)"
+tmpfile="$(mktemp)"
 
-case "$1" in
-    "--nsfw"|"nsfw"|"-n"|"n")
-        echo "Getting a nsfw image"
+while :; do
+    case "$1" in
+        "--verbose"|"--debug"|"-v")
+            if [ -z "$debug" ]; then
+                [ "$debug" = "true" ] && echo "Enabling debug output"
+                debug="true"
+            else
+                echo "debug has already been enabled!"
+            fi
+            ;;
+
+        "--offline"|"-o")
+            if [ -z "$offline" ]; then
+                [ "$debug" = "true" ] && echo "Enabling offline mode"
+                offline="true"
+            else
+                echo "offline has already been enabled!"
+            fi
+            ;;
+
+        "--nekodir")
+            if [ -z "$nekodir" ]; then
+                nekodir="$2"
+                offline="true"
+                [ "$debug" = "true" ] && echo "Using offline dir $nekodir"
+            else
+                echo "You can only specify the neko dir argument once!"
+            fi
+            shift
+            ;;
+
+        "--nsfw"|"nsfw"|"-n"|"n")
+            if [ -z "$imgtype" ]; then
+                [ "$debug" = "true" ] && echo "Getting a nsfw image"
+                imgtype="nsfw"
+            else
+                echo "$imgtype images were already chosen! Please only specify either sfw or nsfw!"
+            fi
+            ;;
+
+        "--sfw"|"sfw"|"-s"|"s")
+            if [ -z "$imgtype" ]; then
+                [ "$debug" = "true" ] && echo "Getting a sfw image"
+                imgtype="sfw"
+            else
+                echo "$imgtype images were already chosen! Please only specify either sfw or nsfw!"
+            fi
+            ;;
+
+        "--w3m"|"w3m"|"--img"|"img"|"-i"|"i")
+            [ "$debug" = "true" ] && echo "Using w3m image backend for neofetch"
+            use_w3m="true"
+            ;;
+
+        "--height"|"-h")
+            if [ -z "$use_height" ]; then
+                use_height="$2"
+                [ "$debug" = "true" ] && echo "Using height $use_height"
+            else
+                echo "You can only specify the height argument once!"
+            fi
+            shift
+            ;;
+
+        *)
+            if [ -z "$1" ]; then
+                break
+            fi
+            echo "Could not interpret parameter '$1'."
+            ;;
+    esac
+    shift
+done
+offlineloc="${nekodir:-/usr/share/nekofetch/nekos}"
+if [ "$offline" = "true" ]; then
+    if [ ! -d "$offlineloc" ]; then
+        echo "The specified offline images location ($offlineloc) does not exist or is not a directory!"
+        exit 1
+    fi
+fi
+[ "$debug" = "true" ] && [ "$offline" = "true" ] && echo "The offline images location is $offlineloc"
+
+if [ ! "$offline" = "true" ]; then
+    if [ "$imgtype" = "nsfw" ]; then
         imgurl="https://nekos.life/api/v2/img/cum_jpg"
-        ;;
-    "--sfw"|"sfw"|"-s"|"s")
-        echo "Getting a sfw image"
+    else
         imgurl="https://nekos.life/api/v2/img/neko"
-        ;;
-    *)
-        echo "Could not interpret as either sfw or nsfw. Defaulting to sfw."
-        imgurl="https://nekos.life/api/v2/img/neko"
-        ;;
-esac
+    fi
+fi
 
-echo "$2" | grep -qE '^[0-9]+$' && height="$2" || height="$(($(stty size | awk '{print $1}') - 5))"
-echo "Using height $height"
+if [ -n "$use_height" ]; then
+    height="$use_height"
+else
+    height="$(($(stty size | awk '{print $1}') - 5))"
+fi
 
-url=$(curl -fsSL "$imgurl" | jq -r ".url")
+if [ "$offline" = "true" ]; then
+    pickdir="$offlineloc/$imgtype"
+    cp "$(find "$pickdir" -type f | shuf -n 1)" "$tmpfile.jpg"
+else
+    url=$(curl -fsSL "$imgurl" | jq -r ".url")
+    [ "$debug" = "true" ] && echo "Using image at url $url"
+    curl -fsSLo "$tmpfile.jpg" "$url"
+fi
 
-curl -fsSLo "$tmpfile.jpg" "$url"
 if [ "$TERM" = "xterm-kitty" ]; then
-    neofetch --kitty "$tmpfile.jpg"
+    command -v convert > /dev/null 2>&1 && neofetch --kitty "$tmpfile.jpg" || kitty_imagemagick_warn=true
+    if [ "$kitty_imagemagick_warn" = "true" ]; then
+        jp2a --height="$height" "$tmpfile.jpg" > "$tmpfile"
+        neofetch --source "$tmpfile"
+    fi
+
+elif [ "$LC_TERMINAL" = "iTerm2" ]; then
+    neofetch --iterm2 "$tmpfile.jpg"
+
+elif [ "$use_w3m" = "true" ]; then
+    neofetch --w3m "$tmpfile.jpg"
+
 else
     jp2a --height="$height" "$tmpfile.jpg" > "$tmpfile"
     neofetch --source "$tmpfile"
 fi
 
 rm "$tmpfile" "$tmpfile.jpg"
+
+if [ "$kitty_imagemagick_warn" = "true" ]; then
+    echo "WARN: imagemagick is required for kitty image backend"
+fi