clean, added patch, added plugins

3 files changed, 45 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62c232aae962..577456c3c33b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,9 @@ pkgbase = regripper-git
 	depends = perl-parse-registry
 	options = !emptydirs
 	source = regripper-git::git+https://github.com/keydet89/RegRipper2.8.git
+	source = patch.diff
 	md5sums = SKIP
+	md5sums = a8455a8a0ad1fbf3880c9771db24e36e
 
 pkgname = regripper-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 875558524540..ede7b744465e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,59 +10,36 @@ url="https://github.com/keydet89/RegRipper2.8"
 depends=('perl' 'perl-parse-registry')
 makedepends=('git')
 options=('!emptydirs')
-source=("$pkgname::git+https://github.com/keydet89/RegRipper2.8.git")
-md5sums=('SKIP')
+source=("$pkgname::git+https://github.com/keydet89/RegRipper2.8.git"
+        "patch.diff")
+md5sums=('SKIP'
+         'a8455a8a0ad1fbf3880c9771db24e36e')
 
 pkgver() {
   cd "$pkgname"
   (set -o pipefail
    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
-   echo $pkg
 }
 
 build() {
-  cd "$pkgname"
-  # Remove windows perl shebang
-  tail -n +2 rip.pl > regripper
-  # Clean windows ^M new lines
-  sed -i $'s/\r$//' regripper
-  # Add your Linux perl shebang
-  sed -i "1i #!$(which perl)" regripper
-  sed -i '2i use lib qw(/usr/local/lib/rip-lib/lib/perl5/);' regripper
+  patch -o "$pkgname/regripper" "$pkgname/rip.pl" < patch.diff
+  #cd "$pkgname"
+  ## Remove windows perl shebang
+  #tail -n +2 rip.pl > regripper
+  ## Clean windows ^M new lines
+  #sed -i $'s/\r$//' regripper
+  ## Add your Linux perl shebang
+  #sed -i "1i #!$(which perl)" regripper
+  #sed -i '2i use lib qw(/usr/local/lib/rip-lib/lib/perl5/);' regripper
 }
 
 package() {
   install -p -dm 755 "$pkgdir/usr/bin/"
   install -p -m 755 "$pkgname/regripper" "$pkgdir/usr/bin/"
+
+  install -p -dm 755 "$pkgdir/usr/share/regripper/plugins/"
+  install -p -m 755 "$pkgname/plugins/"* "$pkgdir/usr/share/regripper/plugins/"
 }
 
-#build() {
-#  cd "$srcdir/$_dist-$pkgver"
-#
-#  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
-#  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
-#    PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
-#    PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-#    MODULEBUILDRC=/dev/null
-#
-#  /usr/bin/perl Makefile.PL
-#  make
-#}
-#
-#check() {
-#  cd "$srcdir/$_dist-$pkgver"
-#
-#  unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
-#  export PERL_MM_USE_DEFAULT=1
-#
-#  make test
-#}
-#
-#package() {
-#  cd "$srcdir/$_dist-$pkgver"
-#
-#  unset INSTALLDIRS DESTDIR PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
-#  
-#  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
-#}
+
diff --git a/patch.diff b/patch.diff
new file mode 100644
index 000000000000..67af85f4f85b
--- /dev/null
+++ b/patch.diff
@@ -0,0 +1,26 @@
+--- rip.pl	2017-04-10 03:17:50.442178408 +0200
++++ regripper	2017-04-10 03:17:46.646189632 +0200
+@@ -1,4 +1,5 @@
+-#! c:\perl\bin\perl.exe
++#!/usr/bin/perl
++use lib qw(/usr/local/lib/rip-lib/lib/perl5/);
+ #-------------------------------------------------------------------------
+ # Rip - RegRipper, CLI version
+ # Use this utility to run a plugins file or a single plugin against a Reg
+@@ -60,7 +61,7 @@
+ #push(@INC,$str);
+ 
+ #my $plugindir = $str."plugins/";
+-my $plugindir = File::Spec->catfile("plugins");
++my $plugindir = File::Spec->catfile("/usr/share/regripper/plugins");
+ #print "Plugins Dir = ".$plugindir."\n";
+ # End code update
+ my $VERSION = "2\.8_20130801";
+@@ -347,4 +348,5 @@
+ 	};
+ 	$t = 0 if ($t < 0);
+ 	return $t;
+-}
+\ No newline at end of file
++}
++