Permalink
Browse files

RECOVERY COMMIT. Harddisk failure.

  • Loading branch information...
1 parent 5d2e0b9 commit 51d9913cd57409dae901f673a5c19b8319b8d898 @tomas tomas committed Dec 20, 2010
@@ -20,7 +20,7 @@ get_wifi_access_points() {
-e 's/CHANNEL \([0-9]*\)/"channel": \1/g' \
-e 's/NOISE \([0-9]*\)/"signal_to_noise": \1/g' \
-e 's/RSSI \([0-9]*\)/"signal_strength": \1/g' \
- -e 's/SSID_STR \([a-zA-Z0-9_.&#@%; -]*\)/"ssid": "\1"}/g' \
+ -e 's/SSID_STR \([^,]*\)/"ssid": "\1"}/g' \
-e 's/ "\([,|}]\)/"\1/g' \
-e 's/"/\\"/g'`
View
@@ -1 +1 @@
-1.5
+1.6
View
@@ -5,23 +5,37 @@
# License: GPLv3
####################################################################
-activate_lock(){
+# set -bm
- if [ -z `is_process_running 'prey-lock'` ]; then
- local command="\"$lock__executable\" `md5_hash_for $lock__unlock_pass`"
- run_as_current_user "$command" &
+before_lock_callback(){
+ log " -- Running lock before callback."
+}
- pid=$!
- wait $pid
- rs=$?
- # echo "return status was: $rs"
- if [ $rs -eq 66 ]; then
- log " -- Correct password entered."
- deactivate_modules_on_panel "lock"
- elif [ $rs != 0 ]; then
- activate_lock
- fi
- else
+after_lock_callback(){
+ log " -- Running lock after callback."
+}
+
+activate_lock(){
+
+ if [ -n "`is_process_running 'prey-lock'`" ]; then
log ' -- Prey lock seems to be running already!'
+ return 1
+ fi
+
+ before_lock_callback
+ local command="\"$lock__executable\" `md5_hash_for $lock__unlock_pass`"
+ run_as_current_user "$command" &
+ # trap 'reactivate_lock' SIGCHLD
+ pid=$!
+ wait $pid
+ rs=$?
+ # echo "return status was: $rs"
+ if [ $rs -eq 66 ]; then
+ deactivate_modules_on_panel "lock"
+ elif [ $rs != 0 ]; then
+ activate_lock
+ return
fi
+ after_lock_callback
+
}
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>prey-lock</string>
<key>CFBundleIdentifier</key>
- <string>com.usefork.prey-lock</string>
+ <string>com.forkltd.prey-lock</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -22,10 +22,6 @@
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
- <key>LSUIElement</key>
- <true/>
- <key>LSUIPresentationMode</key>
- <integer>4</integer>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Binary file not shown.
View
@@ -1 +1 @@
-1.6
+2.5
View
@@ -5,30 +5,30 @@
# License: GPLv3
####################################################################
-# whether we should 'delete' or 'hide' the files (by appending '.backup' to the folder)
+# whether to delete data or to hide it
secure__method='hide'
-# whether to hide or delete the keychains/keyrings that holds all the different
+# should we make sure the program were wiping the user data for isn't running?
+secure__terminate_if_running='y'
+
+# whether to destroy the keychains/keyrings that holds all the different
# passwords in your system. recommended if you do use them.
-secure__credentials='n'
+secure__delete_credentials='n'
-# hide/delete all user profiles for firefox
-secure__firefox_data='n'
+# delete all user profiles for firefox
+secure__delete_firefox_data='n'
-# hide/delete all user profiles for chrome
-secure__chrome_data='n'
+# delete all user profiles for chrome
+secure__delete_chrome_data='n'
-# hide/delete all user profiles for safari (mac & windows only)
-secure__safari_data='n'
+# delete or hide all user profiles for safari (mac & windows only)
+secure__delete_safari_data='n'
# delete everything for running user in IE (windows only)
-secure__ie_data='n'
+secure__delete_ie_data='n'
-# hide/delete data for all Thunderbird profiles in your PC so that none email and contacts can be found.
-secure__thunderbird_data='n'
+# Appends '.backup' to all Thunderbird profiles in your PC so that none email and contacts can be found.
+secure__hide_thunderbird_data='n'
-# hide/delete data for all Outlook profiles in your PC so that your email and contacts are not found.
-secure__outlook_data='n'
-
-# should we make sure the program were wiping the user data for isn't running?
-secure__terminate_if_running='y'
+# Appends '.backup' to your Outlook profile path so that your email and contacts are not found.
+secure__hide_outlook_data='n'
View
@@ -6,7 +6,7 @@
####################################################################
# AFAIK windows doesnt have a keychain as linux and Mac do...
-if [[ "$secure__credentials" == 'y' && "$os" != "windows" ]]; then
+if [[ "$secure__delete_credentials" == 'y' && "$os" != "windows" ]]; then
secure_folder "${credentials_path}"
fi
@@ -30,11 +30,15 @@ if [ "$secure__hide_thunderbird_data" == 'y' ]; then
secure_folder "$thunderbird_path" 'thunderbird'
fi
-if [[ "$secure__hide_outlook_data" == 'y' && "$os" == "windows" ]]; then
- secure_folder "$outlook_path" 'outlook'
-fi
+if [ "$os" == "windows" ]; then
+
+ if [ "$secure__hide_outlook_data" == 'y' && ]; then
+ secure_folder "$outlook_path" 'outlook'
+ fi
+
+ # Prey currently handles IE among Windows, not in other environments such as Wine. Sorry. :)
+ if [ "$secure__delete_ie_data" == 'y' ]; then
+ secure_ie_data
+ fi
-# Prey currently handles IE among Windows, not in other environments such as Wine. Sorry. :)
-if [[ "$secure__delete_ie_data" == 'y' && "$os" == "windows" ]]; then
- secure_ie_data
fi
View
@@ -1 +1 @@
-1.8
+1.9
View
@@ -1 +1 @@
-1.6
+1.7

0 comments on commit 51d9913

Please sign in to comment.