updated pkgname

7 files changed, 37 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08fa13d786d6..33d28cf43ddd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ pkgbase = mini-diary-git
 	pkgver = 2.4.1.r16.g90bf72e
 	pkgrel = 1.2
 	url = https://github.com/samuelmeuli/mini-diary
-	install = mini-diary.install
+	install = mini-diary-git.install
 	arch = x86_64
 	license = MIT
 	makedepends = git
@@ -12,14 +12,14 @@ pkgbase = mini-diary-git
 	depends = electron
 	provides = mini-diary-git
 	conflicts = mini-diary-git
-	source = mini-diary::git+https://github.com/samuelmeuli/mini-diary.git#commit=90bf72e126b4a365e0a01095b5d3f316d12cbe5c
-	source = mini-diary.sh
-	source = mini-diary.desktop
-	source = mini-diary.install
+	source = mini-diary-git::git+https://github.com/samuelmeuli/mini-diary.git#commit=90bf72e126b4a365e0a01095b5d3f316d12cbe5c
+	source = mini-diary-git.sh
+	source = mini-diary-git.desktop
+	source = mini-diary-git.install
 	md5sums = SKIP
-	md5sums = 58bbcfb0f107d1e6dc6af01ccbbde552
-	md5sums = 7efca87d5c782c6b4334e381e5c67b3e
-	md5sums = 292b53906f31d9bc445961e8a33092b1
+	md5sums = 4266c8313117e3bb6dd92fc41d5bbdf6
+	md5sums = 7d35b529e86b007b9d6b310cf04bb038
+	md5sums = 0f4f35bfb1705117bf18b5c23e987ed6
 
 pkgname = mini-diary-git
 
diff --git a/.gitignore b/.gitignore
index 6b2803715f76..f2a4da8714d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 *
 
-!mini-diary.desktop
-!mini-diary.install
-!mini-diary.sh
+!mini-diary-git.desktop
+!mini-diary-git.install
+!mini-diary-git.sh
 !PKGBUILD
 !.SRCINFO
 !.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 662584963a3e..3e4e574c48fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,6 @@
 # Maintainer: davedatum <ask at davedatum dot com>
 
 pkgname=mini-diary-git
-_pkgname=mini-diary
 pkgver=2.4.1.r16.g90bf72e
 pkgrel=1.2
 pkgdesc="Simple and secure journal app"
@@ -12,43 +11,43 @@ depends=("electron")
 makedepends=("git" "npm" "imagemagick")
 provides=("${pkgname}")
 conflicts=("${pkgname}")
-install=${_pkgname}.install
-source=("${_pkgname}::git+$url.git#commit=90bf72e126b4a365e0a01095b5d3f316d12cbe5c"
-		"${_pkgname}.sh"
-		"${_pkgname}.desktop"
-		"${_pkgname}.install")
-md5sums=("SKIP"
-         "58bbcfb0f107d1e6dc6af01ccbbde552"
-         "7efca87d5c782c6b4334e381e5c67b3e"
-         "292b53906f31d9bc445961e8a33092b1")
+install=${pkgname}.install
+source=("${pkgname}::git+$url.git#commit=90bf72e126b4a365e0a01095b5d3f316d12cbe5c"
+		"${pkgname}.sh"
+		"${pkgname}.desktop"
+		"${pkgname}.install")
+md5sums=('SKIP'
+         '4266c8313117e3bb6dd92fc41d5bbdf6'
+         '7d35b529e86b007b9d6b310cf04bb038'
+         '0f4f35bfb1705117bf18b5c23e987ed6')
 
 prepare() {
-	sed -i -e '/"scripts": {/a "linux": "npm run build && electron-builder --dir",' "${srcdir}/${_pkgname}/package.json"
-	sed -i -e '/"build:app": "electron-builder --mac --windows --linux"/d' "${srcdir}/${_pkgname}/package.json"
-	sed -i -e '/webPreferences: {/a devTools: false,' "${srcdir}/${_pkgname}/src/main/main.ts"
+	sed -i -e '/"scripts": {/a "linux": "npm run build && electron-builder --dir",' "${srcdir}/${pkgname}/package.json"
+	sed -i -e '/"build:app": "electron-builder --mac --windows --linux"/d' "${srcdir}/${pkgname}/package.json"
+	sed -i -e '/webPreferences: {/a devTools: false,' "${srcdir}/${pkgname}/src/main/main.ts"
 }
 
 pkgver() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}"
+	cd "${srcdir}/${pkgname}"
 	npm install && npm run linux
 }
 
 package() {
-	install -Dm755 "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${_pkgname}/app.asar"
-	install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-	install -Dm644 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+	install -Dm755 "${srcdir}/${pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${pkgname}/app.asar"
+	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -Dm644 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 
-	install -Dm644 "${srcdir}/${_pkgname}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 "${srcdir}/${pkgname}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   	for _size in "192x192" "128x128" "96x96" "64x64" "48x48" "32x32" "24x24" "22x22" "20x20" "16x16" "8x8"
   	do
     	install -dm755 "${pkgdir}/usr/share/icons/hicolor/${_size}/apps"
-    	convert "${srcdir}/${_pkgname}/website/img/app-icon.png" \
-    	-resize "${_size}" "${pkgdir}/usr/share/icons/hicolor/${_size}/apps/${_pkgname}.png"
+    	convert "${srcdir}/${pkgname}/website/img/app-icon.png" \
+    	-resize "${_size}" "${pkgdir}/usr/share/icons/hicolor/${_size}/apps/${pkgname}.png"
   	done
 }
\ No newline at end of file
diff --git a/mini-diary.desktop b/mini-diary-git.desktop
index 87cdbdfda491..7c1d8d9e3318 100644
--- a/mini-diary.desktop
+++ b/mini-diary-git.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Mini Diary
 Comment=Simple and secure journal app
-Exec=/usr/bin/mini-diary
+Exec=/usr/bin/mini-diary-git
 Terminal=false
 Type=Application
 Icon=mini-diary
diff --git a/mini-diary.install b/mini-diary-git.install
index 1b9b317b7641..963b7e223755 100644
--- a/mini-diary.install
+++ b/mini-diary-git.install
@@ -1,5 +1,5 @@
 post_install() {
-		chmod +x /usr/bin/mini-diary
+		chmod +x /usr/bin/mini-diary-git
 }
 
 post_upgrade() {
diff --git a/mini-diary-git.sh b/mini-diary-git.sh
new file mode 100755
index 000000000000..31a4861bb308
--- /dev/null
+++ b/mini-diary-git.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Launch application
+exec electron /opt/mini-diary-git/app.asar "$@"
\ No newline at end of file
diff --git a/mini-diary.sh b/mini-diary.sh
deleted file mode 100755
index 9a7d5b466919..000000000000
--- a/mini-diary.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Launch application
-exec electron /opt/mini-diary/app.asar "$@"
\ No newline at end of file