fix line endings

4 files changed, 28 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8f8b745f209..e3fb13f9672a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = joomscan-git
 	pkgdesc = OWASP Joomla! security scanner
-	pkgver = 0.0.7+27+g4192949
-	pkgrel = 2
+	pkgver = 0.0.7+38+g7931539
+	pkgrel = 1
 	url = https://www.owasp.org/index.php/Category:OWASP_Joomla_Vulnerability_Scanner_Project
-	changelog = CHANGELOG
+	changelog = CHANGELOG.md
 	arch = any
 	license = GPL3
 	makedepends = git
-	makedepends = rsync
 	depends = perl
 	provides = joomscan
 	conflicts = joomscan
@@ -15,4 +14,3 @@ pkgbase = joomscan-git
 	sha256sums = SKIP
 
 pkgname = joomscan-git
-
diff --git a/.gitignore b/.gitignore
index 66b47a483dcc..9747d8437a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!CHANGELOG
+!CHANGELOG.md
diff --git a/CHANGELOG b/CHANGELOG.md
index 7de8f83aa9a4..d34f749cb7c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 OWASP JoomScan 0.0.7 [Self Challenge]
-=====================================
+============
 * com_joomanager exploiter removed
 * Added new module: Local File Disclosure vulnerability detector (Supports detection of [com_joomanager,s5_media_player,com_hdflvplayer,com_macgallery,com_cckjseblod,fsave,com_portfolio,com_picsell,captcha,com_rsfiles,com_addproperty,com_aceftp,com_jtagmembersdirectory,com_facegallery,com_docman,mod_dvfoldercontent,com_contushdvideoshare,com_jetext,com_product_modul,wddownload,com_community,com_download-monitor])
 * Updated  module: Firewall Detector (supports detection of [CloudFlare, Incapsula, Shieldfy, Mod_Security and 28 other modules ])
@@ -8,7 +8,7 @@ OWASP JoomScan 0.0.7 [Self Challenge]
 * A few enhancements
 
 OWASP JoomScan 0.0.6 [#BHUSA]
-=============================
+============
 * Updated vulnerability databases
 * Added new module: Firewall Detector (supports detection of [CloudFlare, Incapsula, Shieldfy, Mod_Security])
 * Added exploit for com_joomanager
@@ -16,7 +16,7 @@ OWASP JoomScan 0.0.6 [#BHUSA]
 * A few enhancements
 
 OWASP JoomScan 0.0.5 [KLOT]
-===========================
+============
 * Update components database
 * Bug fixed (updating module)
 * Allow start from any path
@@ -31,5 +31,5 @@ OWASP JoomScan 0.0.5 [KLOT]
 * A few enhancements
 
 OWASP JoomScan 0.0.1 [Reborn]
-=============================
+============
 * Initial release
diff --git a/PKGBUILD b/PKGBUILD
index 2ecb5780b4ac..cab4f95b015e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,37 @@
 
 
 pkgname=joomscan-git
-pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	git describe --tags | sed 's:-:\+:g'
-}
-pkgver=0.0.7+27+g4192949
-pkgrel=2
+_name="${pkgname%-git}"
+
+pkgver() { git -C "$_name" describe --tags | sed 's:-:\+:g'; }
+pkgver=0.0.7+38+g7931539
+pkgrel=1
 
 pkgdesc='OWASP Joomla! security scanner'
 arch=('any')
-url='https://www.owasp.org/index.php/Category:OWASP_Joomla_Vulnerability_Scanner_Project'
+url=https://www.owasp.org/index.php/Category:OWASP_Joomla_Vulnerability_Scanner_Project
 license=('GPL3')
 
-depends=('perl')
-makedepends=('git' 'rsync')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+provides=("$_name")
+conflicts=("$_name")
 
-changelog='CHANGELOG'
-source=("git+https://github.com/rezasp/${pkgname%-git}")
+makedepends=('git')
+depends=('perl')
 
+changelog='CHANGELOG.md'
+source=("git+https://github.com/rezasp/$_name")
 sha256sums=('SKIP')
 
+
+prepare() { find "$_name" -name '*.pl' -exec sed -i 's/\r$//' {} \;; }
+
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	install -Dm755 -t "$pkgdir/usr/lib/${pkgname%-git}/" "${pkgname%-git}".pl
-	rsync -rpt core exploit modules "$pkgdir/usr/lib/${pkgname%-git}/"
-	install -Dm644 -t "$pkgdir/usr/share/doc/${pkgname%-git}/" *.md Dockerfile
+	cd "$_name"
+	install -Dm755 "$_name".pl -t"$pkgdir/usr/lib/$_name/"
+	cp -a --no-preserve=o core exploit modules "$pkgdir/usr/lib/$_name/"
 	install -dm755 "$pkgdir/usr/bin"
-	#ln -Ts "/usr/lib/${pkgname%-git}/${pkgname%-git}.pl" "$pkgdir/usr/bin/${pkgname%-git}"
-	cat >"$pkgdir/usr/bin/${pkgname%-git}" <<-EOT
-		#!/bin/sh
-
-		/usr/bin/perl "/usr/lib/${pkgname%-git}/${pkgname%-git}.pl"
-	EOT
-	chmod 755 "$pkgdir/usr/bin/${pkgname%-git}"
+	ln -s "/usr/lib/$_name/$_name.pl" "$pkgdir/usr/bin/$_name"
+	install -Dm644 {CHANGELOG,README}.md Dockerfile -t"$pkgdir/usr/share/doc/$_name/"
 }