fix module path

4 files changed, 47 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47b6d5675f51..40c2e33ef6ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,20 @@
 pkgbase = dain-ncnn-vulkan-bin
 	pkgdesc = DAIN, Depth-Aware Video Frame Interpolation implemented with ncnn library
 	pkgver = 20210210
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/nihui/dain-ncnn-vulkan
 	arch = x86_64
 	license = MIT
+	makedepends = sh
 	depends = vulkan-icd-loader
 	depends = vulkan-headers
 	provides = dain-ncnn-vulkan
 	conflicts = dain-ncnn-vulkan
 	conflicts = dain-ncnn-vulkan-git
 	source = https://github.com/nihui/dain-ncnn-vulkan/releases/download/20210210/dain-ncnn-vulkan-20210210-ubuntu.zip
+	source = dain-ncnn-vulkan
 	sha256sums = 960a42921a4c646f9176232147d3a5883703f815276a40df794125046a682f4d
+	sha256sums = bc7fb31ade458a268fe1bb96b98d5a7970f35574eaa88e55247dad8fc6e2e3df
 
 pkgname = dain-ncnn-vulkan-bin
 
diff --git a/.gitignore b/.gitignore
index 018a3de08144..d9eb51986d8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 !PKGBUILD
 !.SRCINFO
 !.gitignore
+!dain-ncnn-vulkan
diff --git a/PKGBUILD b/PKGBUILD
index 7f1d4664618a..eda615185f37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,31 @@
 # Maintainer: PumpkinCheshire <sollyonzou@gmail.com>
 
-_name=dain-ncnn-vulkan
 pkgname=dain-ncnn-vulkan-bin
 pkgver=20210210
-pkgrel=1
+pkgrel=2
 pkgdesc="DAIN, Depth-Aware Video Frame Interpolation implemented with ncnn library"
 arch=('x86_64')
 url="https://github.com/nihui/dain-ncnn-vulkan"
 license=('MIT')
 depends=("vulkan-icd-loader" "vulkan-headers")
-makedepends=()
+makedepends=('sh')
 provides=("dain-ncnn-vulkan")
 conflicts=("dain-ncnn-vulkan" "dain-ncnn-vulkan-git")
-source=("https://github.com/nihui/$_name/releases/download/$pkgver/$_name-$pkgver-ubuntu.zip")
-sha256sums=('960a42921a4c646f9176232147d3a5883703f815276a40df794125046a682f4d')
+source=("https://github.com/nihui/${pkgname%-bin}/releases/download/$pkgver/${pkgname%-bin}-$pkgver-ubuntu.zip"
+	"dain-ncnn-vulkan")
+sha256sums=('960a42921a4c646f9176232147d3a5883703f815276a40df794125046a682f4d'
+	'bc7fb31ade458a268fe1bb96b98d5a7970f35574eaa88e55247dad8fc6e2e3df')
 
 package() {
-	cd "${srcdir}/$_name-$pkgver-ubuntu"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm755 ${pkgname%-bin} "${pkgdir}/usr/bin/${pkgname%-bin}"
 
-	install -Dm755 "${srcdir}/$_name-$pkgver-ubuntu/$_name" "${pkgdir}/usr/share/$_name/$_name"
+	cd "${srcdir}/${pkgname%-bin}-$pkgver-ubuntu"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname%-bin}/LICENSE"
 
-	cd "${srcdir}/$_name-$pkgver-ubuntu/"
+	install -Dm755 "${srcdir}/${pkgname%-bin}-$pkgver-ubuntu/${pkgname%-bin}" "${pkgdir}/usr/share/${pkgname%-bin}/${pkgname%-bin}"
+
+	cd "${srcdir}/${pkgname%-bin}-$pkgver-ubuntu/"
 	for f in best/*; do
-		install -Dm 644 "$f" ${pkgdir}/usr/share/$_name/"$f"
+		install -Dm 644 "$f" ${pkgdir}/usr/share/${pkgname%-bin}/"$f"
 	done
-
-	printf '#!/bin/sh\n/usr/share/dain-ncnn-vulkan/dain-ncnn-vulkan "$@"' >$_name
-	install -Dm755 $_name "${pkgdir}/usr/bin/$_name"
-
 }
diff --git a/dain-ncnn-vulkan b/dain-ncnn-vulkan
new file mode 100755
index 000000000000..dbc45ba0e9fb
--- /dev/null
+++ b/dain-ncnn-vulkan
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+default_model_path="/usr/share/dain-ncnn-vulkan/"
+readonly default_model_path
+
+args=""
+
+while getopts "hv0:1:i:o:m:g:j:f:" arg; do
+    case $arg in
+    h) args="$args -$arg" ;;
+    v) args="$args -$arg" ;;
+    1) args="$args -$arg $OPTARG" ;;
+    0) args="$args -$arg $OPTARG" ;;
+    i) args="$args -$arg $OPTARG" ;;
+    o) args="$args -$arg $OPTARG" ;;
+    m)
+        if ! [ -d $OPTARG ]; then
+            args="$args -m $default_model_path$OPTARG"
+        else
+            args="$args -$arg $OPTARG"
+        fi
+        ;;
+    g) args="$args -$arg $OPTARG" ;;
+    j) args="$args -$arg $OPTARG" ;;
+    f) args="$args -$arg $OPTARG" ;;
+    esac
+done
+
+/usr/share/dain-ncnn-vulkan/dain-ncnn-vulkan $args