From 11bf28745abd66d12da2b2f37bcebb6fdae82899 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sun, 3 Jan 2016 13:49:07 +0100 Subject: [PATCH] Generate folders for cached kernels for the binary distribution in runtime, too --- .gitignore | 2 -- kernels/.lock | 0 kernels/4098/.lock | 0 kernels/4318/.lock | 0 src/oclHashcat.c | 17 +++++++---------- tools/package_bin.sh | 5 +---- 6 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 kernels/.lock delete mode 100644 kernels/4098/.lock delete mode 100644 kernels/4318/.lock diff --git a/.gitignore b/.gitignore index 39eb00ac7..6650f4aba 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 e69de29bb..000000000 diff --git a/kernels/4098/.lock b/kernels/4098/.lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/kernels/4318/.lock b/kernels/4318/.lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/oclHashcat.c b/src/oclHashcat.c index 669470ed0..ce1f0d642 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 2e4b0d37b..6239643c6 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