diff --git a/build.xml b/build.xml index 5616cb2c66e3db82e03cdb93dc830debf2c1f0ea..baeacc0a045193a3cbbf2fff0a02510baef19c79 100644 --- a/build.xml +++ b/build.xml @@ -102,7 +102,6 @@ <copy file="${basedir}/NEWS.txt" tofile="${zip-tmp}/${app.name}/NEWS.txt"/> <copy file="${basedir}/Running_Linux_OSX.txt" tofile="${zip-tmp}/${app.name}/Running_Linux_OSX.txt"/> <copy file="${basedir}/unix_setup.sh" tofile="${zip-tmp}/${app.name}/unix_setup.sh"/> - <replaceregexp file="${zip-tmp}/${app.name}/unix_setup.sh" match="TSK_VERSION=(.*)" replace="TSK_VERSION=${TSK_VERSION}" byline="true"/> <unzip src="${thirdparty.dir}/gstreamer/windows/i386/0.10.7/gstreamer.zip" dest="${zip-tmp}/${app.name}/gstreamer"/> diff --git a/release_scripts/update_sleuthkit_version.pl b/release_scripts/update_sleuthkit_version.pl index e630e4890bb6c0666fea434a4c84fd6f8dbb6454..89b0c42de58bfed098f65ccb2bd9098199ada0e0 100755 --- a/release_scripts/update_sleuthkit_version.pl +++ b/release_scripts/update_sleuthkit_version.pl @@ -31,14 +31,13 @@ sub main { update_tsk_version(); update_core_project_properties(); update_core_project_xml(); - + update_unix_setup(); + print "Files updated. You need to commit and push them\n"; } - - ###################################################### # Utility functions @@ -194,6 +193,39 @@ sub update_core_project_xml { } +# update the tskversion.xml +sub update_unix_setup { + + my $orig = "unix_setup.sh"; + my $temp = "${orig}-bak"; + + print "Updating the version in ${orig}\n"; + + open (CONF_IN, "<${orig}") or die "Cannot open ${orig}"; + open (CONF_OUT, ">${temp}") or die "Cannot open ${temp}"; + + my $found = 0; + while (<CONF_IN>) { + if (/^TSK_VERSION=/) { + print CONF_OUT "TSK_VERSION=${VER}\n"; + $found++; + } + else { + print CONF_OUT $_; + } + } + close (CONF_IN); + close (CONF_OUT); + + if ($found != 1) { + die "$found (instead of 1) occurrences of TSK_VERSION found in ${orig}"; + } + + unlink ($orig) or die "Error deleting ${orig}"; + rename ($temp, $orig) or die "Error renaming tmp $orig file"; + system("git add ${orig}") unless ($TESTING); + +} -main(); \ No newline at end of file +main(); diff --git a/unix_setup.sh b/unix_setup.sh index 04766c7bc4dd0504950c9e928033efde5a72f3a2..328f25c2d0b683d1eac64fab9a1d28fd22571e4e 100755 --- a/unix_setup.sh +++ b/unix_setup.sh @@ -2,7 +2,9 @@ # Verifies programs are installed and copies native code into the Autopsy folder structure -TSK_VERSION=4.6.3 +# NOTE: update_sleuthkit_version.pl updates this value and relies +# on it keeping the same name and whitespace. Don't change it. +TSK_VERSION=4.6.5 # Verify PhotoRec was installed photorec_filepath=/usr/bin/photorec