From: jsteube <jens.steube@gmail.com>
Date: Sun, 3 Jan 2016 12:49:07 +0000 (+0100)
Subject: Generate folders for cached kernels for the binary distribution in runtime, too
X-Git-Tag: v3.00-beta~572
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;ds=sidebyside;h=11bf28745abd66d12da2b2f37bcebb6fdae82899;p=hashcat.git

Generate folders for cached kernels for the binary distribution in runtime, too
---

diff --git a/.gitignore b/.gitignore
index 39eb00a..6650f4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,3 @@ deps/*
 deps/**
 lib/*.a
 obj/*.o
-kernels/4098/*.llvmir
-kernels/4318/*.cubin
diff --git a/kernels/.lock b/kernels/.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/kernels/4098/.lock b/kernels/4098/.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/kernels/4318/.lock b/kernels/4318/.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 669470e..ce1f0d6 100644
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -12352,22 +12352,19 @@ int main (int argc, char **argv)
      * cached kernel path depends on vendor_id which we don't know, so create it here
      */
 
-    if (profile_dir != install_dir) // not a bug
-    {
-      int vendor_id_folder_size = strlen (profile_dir) + 1 + 7 + 1 + 10 + 1;
+    int vendor_id_folder_size = strlen (profile_dir) + 1 + 7 + 1 + 10 + 1;
 
-      char *vendor_id_folder = (char *) mymalloc (vendor_id_folder_size);
+    char *vendor_id_folder = (char *) mymalloc (vendor_id_folder_size);
 
-      snprintf (vendor_id_folder, vendor_id_folder_size - 1, "%s/kernels", profile_dir);
+    snprintf (vendor_id_folder, vendor_id_folder_size - 1, "%s/kernels", profile_dir);
 
-      mkdir (vendor_id_folder, 0700);
+    mkdir (vendor_id_folder, 0700);
 
-      snprintf (vendor_id_folder, vendor_id_folder_size - 1, "%s/kernels/%d", profile_dir, vendor_id);
+    snprintf (vendor_id_folder, vendor_id_folder_size - 1, "%s/kernels/%d", profile_dir, vendor_id);
 
-      mkdir (vendor_id_folder, 0700);
+    mkdir (vendor_id_folder, 0700);
 
-      myfree (vendor_id_folder);
-    }
+    myfree (vendor_id_folder);
 
     /**
      * devices
diff --git a/tools/package_bin.sh b/tools/package_bin.sh
index 2e4b0d3..6239643 100755
--- a/tools/package_bin.sh
+++ b/tools/package_bin.sh
@@ -11,7 +11,7 @@ export OUT=$HOME/xy/oclHashcat-2.01
 rm -rf $OUT
 rm -rf $OUT.7z
 
-mkdir -p $OUT $OUT/kernels $OUT/kernels/4098 $OUT/kernels/4318
+mkdir -p $OUT
 
 cp    $IN/oclHashcat??.exe                      $OUT/
 cp    $IN/oclHashcat??.bin                      $OUT/
@@ -42,9 +42,6 @@ unix2dos $OUT/docs/*
 unix2dos $OUT/example*.cmd
 
 chmod 700 $OUT
-chmod 700 $OUT/kernels
-chmod 700 $OUT/kernels/4098
-chmod 700 $OUT/kernels/4318
 chmod 700 $OUT/rules
 chmod 600 $OUT/rules/*
 chmod 700 $OUT/docs