|  deajan | 2038a2ecb9 | Made bootstrap and merge program agnostic | 2017-06-19 16:01:16 +02:00 | 
				
					
						|  deajan | e07cb136c4 | Permit merge of other executables | 2017-06-18 22:53:57 +02:00 | 
				
					
						|  deajan | 5bcc7c75ea | Permit bootstrap of other executables | 2017-06-18 22:48:38 +02:00 | 
				
					
						|  deajan | 8d9a6be16a | Typo fixing | 2017-06-18 22:11:09 +02:00 | 
				
					
						|  deajan | 06becc5181 | Updated ofunctions | 2017-06-09 11:49:13 +02:00 | 
				
					
						|  deajan | 1dc9408044 | Fix double compression extension | 2017-06-09 09:56:11 +02:00 | 
				
					
						|  deajan | 9676ccccad | Removed work comments | 2017-06-09 08:34:48 +02:00 | 
				
					
						|  deajan | 45e4419a0f | Fixed typo | 2017-06-09 08:33:57 +02:00 | 
				
					
						|  deajan | 9b9631fe2c | Changed sed -E to sed -r for compat issues | 2017-06-08 16:30:20 +02:00 | 
				
					
						|  deajan | 5c36e803d8 | Revert "More sort enforcing" This reverts commit fbb36b51b7. | 2017-06-08 15:39:57 +02:00 | 
				
					
						|  deajan | fbb36b51b7 | More sort enforcing | 2017-06-08 15:20:36 +02:00 | 
				
					
						|  deajan | 9220cecebc | Rebuilt targets | 2017-06-08 14:43:17 +02:00 | 
				
					
						|  deajan | a7f9a28c93 | Merge branch 'master' of https://github.com/deajan/osync | 2017-06-08 14:42:12 +02:00 | 
				
					
						|  deajan | 1f6fe47c2c | Rebuilt targets | 2017-06-08 14:41:59 +02:00 | 
				
					
						|  deajan | 4678ab7e71 | Fixed missing env for LC_ALL | 2017-06-08 09:25:33 +02:00 | 
				
					
						|  deajan | 261521d047 | Added LC_ALL to all ssh calls | 2017-06-07 12:48:52 +02:00 | 
				
					
						|  deajan | 10ebfaae16 | Added LC_ALL=C to all ssh calls | 2017-06-07 12:43:56 +02:00 | 
				
					
						|  deajan | 30c6b3ec46 | timestampList is not used for ACL lists yet | 2017-06-07 12:17:39 +02:00 | 
				
					
						|  deajan | 543cfc1159 | Fixing sort order in conflictList | 2017-06-06 17:39:53 +02:00 | 
				
					
						|  deajan | 679e140084 | Fix new regex in treelist for rsync output | 2017-06-06 16:47:32 +02:00 | 
				
					
						|  deajan | 3e9a380b6b | Updated config to v1.2.2-dev | 2017-06-06 16:21:56 +02:00 | 
				
					
						|  deajan | 84a108dd41 | Rebuilt targets | 2017-06-05 18:59:44 +02:00 | 
				
					
						|  deajan | d0d7be40c3 | Added --dry support for conflict list | 2017-06-05 18:59:05 +02:00 | 
				
					
						|  deajan | 7a24cf49cd | Implemented --alert-conflicts options | 2017-06-05 18:53:15 +02:00 | 
				
					
						|  deajan | be3b3d39b6 | Added error handling to conflict list functions | 2017-06-05 15:32:38 +02:00 | 
				
					
						|  deajan | 11408d2de0 | Add more locale exports | 2017-06-05 15:03:01 +02:00 | 
				
					
						|  deajan | 7260d43416 | Improved conflict list work | 2017-06-04 19:07:22 +02:00 | 
				
					
						|  deajan | 1d7cb5be53 | Multiple file list fixes | 2017-06-04 13:01:34 +02:00 | 
				
					
						|  deajan | b4f1bd37ea | Rebuilt targets | 2017-06-03 13:58:33 +02:00 | 
				
					
						|  deajan | 2b786abc6a | Some comment removal | 2017-06-03 13:57:10 +02:00 | 
				
					
						|  deajan | bd6b1a60e8 | Rebuilt targets | 2017-06-03 13:52:12 +02:00 | 
				
					
						|  deajan | 967ce33977 | WIP: conflict list | 2017-06-03 13:51:49 +02:00 | 
				
					
						|  deajan | 37ca73a6f9 | moved unfortunate comment placement | 2017-06-03 01:28:34 +02:00 | 
				
					
						|  deajan | 9e1c3c2a65 | WIP: conflict list | 2017-06-03 01:20:38 +02:00 | 
				
					
						|  deajan | 862a6fd235 | Fixed some more typo | 2017-06-02 15:42:45 +02:00 | 
				
					
						|  deajan | 83fd33bf78 | WIP: conflict list | 2017-06-01 17:45:02 +02:00 | 
				
					
						|  deajan | 99b606fef8 | WIP: conflict list | 2017-05-31 18:02:18 +02:00 | 
				
					
						|  deajan | b0307fd555 | Another typo fix | 2017-05-31 12:36:39 +02:00 | 
				
					
						|  deajan | eb73d49c69 | Typo fixing | 2017-05-31 12:31:18 +02:00 | 
				
					
						|  deajan | d91230e22f | WIP: conflict list | 2017-05-31 11:16:36 +02:00 | 
				
					
						|  deajan | 825e051e3b | WIP: conflict list | 2017-05-30 15:45:43 +02:00 | 
				
					
						|  deajan | a7ceea1dac | WIP: conflict list | 2017-05-30 15:00:05 +02:00 | 
				
					
						|  Orsiris de Jong | 6a4b3701d0 | Merge branch 'master' into no-resume | 2017-05-30 14:50:21 +02:00 | 
				
					
						|  deajan | 45cb042fa0 | Added --no-resume option | 2017-05-30 14:46:35 +02:00 | 
				
					
						|  deajan | 5c60e7a9a2 | WIP: conflict detection | 2017-05-30 14:36:04 +02:00 | 
				
					
						|  deajan | a99a96e871 | WIP: conflict detection | 2017-05-30 14:35:44 +02:00 | 
				
					
						|  deajan | f98a9a0748 | WIP: getting conflict list of files | 2017-05-30 12:16:59 +02:00 | 
				
					
						|  deajan | b541a7c98e | WIP: detect conflict files | 2017-05-30 11:14:11 +02:00 | 
				
					
						|  Orsiris de Jong | a32314c720 | Merge branch 'master' into fix_options | 2017-05-30 10:18:48 +02:00 | 
				
					
						|  deajan | 520c20659f | Added missing options to subprocess in daemon mode | 2017-05-30 10:12:28 +02:00 | 
				
					
						|  deajan | 908c9af888 | Added --log-conflicts option | 2017-05-30 09:29:16 +02:00 | 
				
					
						|  deajan | 0b442e2bcf | Updated work comments | 2017-05-30 09:19:47 +02:00 | 
				
					
						|  deajan | a32b5f8321 | Bumped version to next dev | 2017-05-30 09:15:48 +02:00 | 
				
					
						|  deajan | 2c1e688d8e | Bumped dev versions to rc | 2017-05-30 09:11:00 +02:00 | 
				
					
						|  deajan | 78dc39b86f | Change 23242 to | 2017-05-30 09:09:25 +02:00 | 
				
					
						|  deajan | f8df6b8eab | Rebuilt targets | 2017-05-29 16:54:02 +02:00 | 
				
					
						|  deajan | 2b163d385b | KillChilds shoudln't allow a pid of 1 either | 2017-05-29 16:53:43 +02:00 | 
				
					
						|  deajan | 3174981b9a | Rebuilt targets | 2017-05-29 15:14:00 +02:00 | 
				
					
						|  deajan | ab40ea64e2 | Checking pid doesn't contain 0 | 2017-05-29 15:13:17 +02:00 | 
				
					
						|  deajan | ee8b213894 | Rebuilt targets | 2017-05-28 22:20:57 +02:00 | 
				
					
						|  deajan | 11bd517982 | Last fix for KillChilds pgrep issue on Mac | 2017-05-28 22:20:41 +02:00 | 
				
					
						|  deajan | 1400390f57 | Rebuilt targets | 2017-05-28 21:25:22 +02:00 | 
				
					
						|  deajan | c2b24688ef | Another fix in the wall | 2017-05-28 21:25:03 +02:00 | 
				
					
						|  deajan | 300108641a | Rebuilt targets | 2017-05-28 20:17:57 +02:00 | 
				
					
						|  deajan | 011a316f94 | Added pid test in KillChilds | 2017-05-28 20:17:38 +02:00 | 
				
					
						|  deajan | fe210877dc | Prevent possible recursive loop with bogus pgrep implementation | 2017-05-28 13:37:12 +02:00 | 
				
					
						|  deajan | 623408bf31 | Rebuilt targets | 2017-05-22 11:19:23 +02:00 | 
				
					
						|  deajan | 5677335c24 | Removed WIP dev sleep command in treeList | 2017-05-22 11:19:03 +02:00 | 
				
					
						|  deajan | 722e366ade | Rebuilt targets | 2017-05-22 09:32:50 +02:00 | 
				
					
						|  deajan | 762fd236a0 | Bumped version to dev again | 2017-05-22 09:32:34 +02:00 | 
				
					
						|  deajan | 1a85d5ded9 | Added -q parameter to ssh to inhibate banners | 2017-05-22 09:32:12 +02:00 | 
				
					
						|  deajan | d1bb2fe68e | Rebuilt targets | 2017-04-26 21:03:25 +02:00 | 
				
					
						|  deajan | 402adba191 | Fixed GetRemoteOS os-release getinfo | 2017-04-26 21:03:04 +02:00 | 
				
					
						|  deajan | 49bdd17202 | Rebuilt targets | 2017-04-26 13:56:11 +02:00 | 
				
					
						|  deajan | 2934951495 | Added wchan to performance profiler | 2017-04-26 13:55:52 +02:00 | 
				
					
						|  deajan | ec857e8e01 | Rebuilt targets | 2017-04-26 13:51:58 +02:00 | 
				
					
						|  deajan | 12685b3154 | Added more params to performance profiler | 2017-04-26 13:51:15 +02:00 | 
				
					
						|  deajan | e10a120e74 | Rebuilt targets | 2017-04-26 13:36:11 +02:00 | 
				
					
						|  deajan | 128051cd8f | Added iostat to perf profiler | 2017-04-26 13:35:54 +02:00 | 
				
					
						|  deajan | 56b9efd686 | Rebuilt targets | 2017-04-26 12:04:21 +02:00 | 
				
					
						|  deajan | bbff9d55d6 | Added perf profiler | 2017-04-26 12:04:00 +02:00 | 
				
					
						|  deajan | ac0f7b3866 | Updated ofunctions | 2017-04-20 21:30:04 +02:00 | 
				
					
						|  deajan | abd0ff640c | Check program type for service files | 2017-04-17 20:28:22 +02:00 | 
				
					
						|  deajan | 9f89d4fdff | Added VerComp Subset | 2017-04-11 13:26:23 +02:00 | 
				
					
						|  deajan | f15e9bf8af | Updated installer from pmocr | 2017-04-11 13:25:36 +02:00 | 
				
					
						|  deajan | d530cbbe44 | Updated ofunctions | 2017-04-11 13:25:03 +02:00 | 
				
					
						|  deajan | 9cfd6c4eb4 | Reenabled all tests | 2017-04-08 22:10:01 +02:00 | 
				
					
						|  deajan | eb5ca2c39d | Added default umask for test run | 2017-04-08 22:05:22 +02:00 | 
				
					
						|  deajan | feb2034b53 | Bumped ofunctions version | 2017-04-08 21:11:12 +02:00 | 
				
					
						|  deajan | 26d698422b | Added umask for log & run files | 2017-04-08 21:07:21 +02:00 | 
				
					
						|  deajan | d416fd1782 | Updated header | 2017-03-25 12:13:04 +01:00 | 
				
					
						|  deajan | 266c0e1e0f | Rebuilt targets | 2017-03-23 23:03:27 +01:00 | 
				
					
						|  deajan | 19c15d2265 | Bumped version to v1.2 final | 2017-03-23 23:02:43 +01:00 | 
				
					
						|  deajan | d9d7bd9f3c | Added MINGW64 to supported OS list | 2017-03-23 21:05:38 +01:00 | 
				
					
						|  deajan | 1404b81d56 | Added initiator dir check before running monitor mode | 2017-03-21 22:56:03 +01:00 | 
				
					
						|  deajan | 2c3e6ac7a9 | Added --remove option in help | 2017-03-21 22:48:44 +01:00 | 
				
					
						|  deajan | 01f1392047 | Updated installer from pmocr | 2017-03-14 22:41:39 +01:00 | 
				
					
						|  deajan | e1d7213e91 | Rebuilt targets | 2017-03-14 22:36:27 +01:00 | 
				
					
						|  deajan | 7116fd594a | Fixed program version | 2017-03-14 22:35:39 +01:00 | 
				
					
						|  deajan | 4f8d57498c | Updated installer version logic | 2017-03-14 21:12:38 +01:00 | 
				
					
						|  deajan | fa0e194819 | Made TSTAMP more readable | 2017-03-13 13:07:16 +01:00 | 
				
					
						|  deajan | 6346a3a94c | Added program check | 2017-03-13 11:46:44 +01:00 | 
				
					
						|  deajan | 24d76f1888 | Prevent possibility to run remote cmds on local runs | 2017-02-13 12:47:46 +01:00 | 
				
					
						|  deajan | b28f3fcc85 | Rebuilt targets | 2017-02-10 11:53:41 +01:00 | 
				
					
						|  deajan | baaf1a621a | Bumped version to v1.2RC3 | 2017-02-10 11:53:01 +01:00 | 
				
					
						|  deajan | 0ef67b1dda | Fixed typo | 2017-02-10 11:43:05 +01:00 | 
				
					
						|  deajan | 0e3894ff59 | Installer now skips ssh_filter removal if needed | 2017-02-10 11:28:43 +01:00 | 
				
					
						|  deajan | 685d1d0bf1 | Don't show failed commands in stdout, only log them | 2017-02-10 11:15:41 +01:00 | 
				
					
						|  deajan | 81438ce2fd | Imported funny _REMOTE_TOKEN obfuscation from obackup :) | 2017-02-10 11:14:11 +01:00 | 
				
					
						|  deajan | 8c40e0c950 | Removed unnecessary spaces | 2017-02-10 10:35:17 +01:00 | 
				
					
						|  deajan | 15e1d7fbe0 | Updated ofunctions from obackup | 2017-02-09 13:02:44 +01:00 | 
				
					
						|  deajan | e837eeeb61 | Rebuilt targets | 2017-02-08 16:28:18 +01:00 | 
				
					
						|  deajan | d539892188 | Bumped to stable state | 2017-02-08 16:27:01 +01:00 | 
				
					
						|  deajan | 98d3cc99b8 | Simplified ssh_filter | 2017-02-08 15:28:41 +01:00 | 
				
					
						|  deajan | 57facf189b | Removed silent option from install test | 2017-02-08 15:03:18 +01:00 | 
				
					
						|  deajan | df95a48d9c | Remove MacOS limitation | 2017-02-08 15:01:41 +01:00 | 
				
					
						|  deajan | 024662f7ad | Fixed typo | 2017-02-08 14:54:03 +01:00 | 
				
					
						|  deajan | 5ca7b7e6a2 | Fix for installer error on msys/cygwin | 2017-02-08 14:53:18 +01:00 | 
				
					
						|  deajan | f0ed2098be | Fix installer on travis | 2017-02-08 14:27:30 +01:00 | 
				
					
						|  deajan | d320c84ce9 | Fixed removing temp key from authorized_keys didn't work | 2017-02-08 14:19:20 +01:00 | 
				
					
						|  deajan | 215e4f2108 | Added install and uninstall to test system | 2017-02-08 14:06:43 +01:00 | 
				
					
						|  deajan | 02b98249ad | Recoded ssh_filter to be easier and more secure | 2017-02-08 13:53:42 +01:00 | 
				
					
						|  deajan | 4135c59869 | Added _REMOTE_TOKEN for ssh_filter | 2017-02-08 13:52:04 +01:00 | 
				
					
						|  deajan | f5c00a82ce | Added ssh_filter comment | 2017-02-08 13:51:41 +01:00 | 
				
					
						|  deajan | 70c858dc3d | Added ssh_filter to tests | 2017-02-08 13:51:26 +01:00 | 
				
					
						|  deajan | c7f676bd6e | Added _REMOTE_TOKEN to test list | 2017-02-08 13:32:40 +01:00 | 
				
					
						|  deajan | 3bd6dd09c7 | Rebuilt targets for v1.2RC2 | 2017-02-08 08:39:59 +01:00 | 
				
					
						|  deajan | 77e4a05613 | Bumped version to v1.2RC2 | 2017-02-08 08:39:26 +01:00 | 
				
					
						|  deajan | ebec33e15e | Make shellcheck happier | 2017-02-08 08:34:24 +01:00 | 
				
					
						|  deajan | f5228fbbbf | Fixed variable name | 2017-02-08 08:32:55 +01:00 | 
				
					
						|  deajan | 7aa1457971 | Removed unnecessary comments | 2017-02-08 08:30:15 +01:00 | 
				
					
						|  deajan | ce9ddee19d | Be able to create /usr/local/bin | 2017-02-07 23:39:20 +01:00 | 
				
					
						|  deajan | 48f9cfc973 | Added mac commands | 2017-02-07 22:51:26 +01:00 | 
				
					
						|  deajan | 839c287ec9 | Better BSD ping when not root | 2017-02-07 22:28:54 +01:00 | 
				
					
						|  deajan | 2a63707cf7 | Quick ping fix for FreeBSD non root | 2017-02-07 22:24:54 +01:00 | 
				
					
						|  deajan | 18a4dc4fe9 | Missing sudo is critical | 2017-02-07 22:19:05 +01:00 | 
				
					
						|  deajan | 0aaf988c48 | check for sudo when needed | 2017-02-07 22:13:52 +01:00 | 
				
					
						|  deajan | ea58a65954 | Quick fix for BSD service files | 2017-02-07 22:10:24 +01:00 | 
				
					
						|  deajan | a186964bc8 | Moved some functions to ofunctions.sh | 2017-02-07 22:05:27 +01:00 | 
				
					
						|  deajan | c1ca28bd41 | Improved os detection here too | 2017-02-07 22:04:50 +01:00 | 
				
					
						|  deajan | 1e7a8d643c | Improved os detection | 2017-02-07 22:04:36 +01:00 | 
				
					
						|  deajan | f9077b7ff6 | Added new list of subsets | 2017-02-07 22:04:19 +01:00 | 
				
					
						|  deajan | 317975c03f | Fixed need to overwrite executables | 2017-02-07 21:39:58 +01:00 | 
				
					
						|  deajan | b07df720d9 | path fixes for rsync and bash | 2017-02-07 21:28:50 +01:00 | 
				
					
						|  deajan | 84ee16cc12 | Minor tweaks for cleanup | 2017-02-07 21:21:41 +01:00 | 
				
					
						|  deajan | 33413fe80d | Another minor fix | 2017-02-07 21:09:36 +01:00 | 
				
					
						|  deajan | 7fc9a2c4fb | Minor fixes | 2017-02-07 21:06:02 +01:00 | 
				
					
						|  deajan | 724f488ab7 | Quick and dirty sudo prepare script | 2017-02-07 20:59:01 +01:00 | 
				
					
						|  deajan | 0c9ab163f0 | Fixed typo | 2017-02-07 17:43:30 +01:00 | 
				
					
						|  deajan | 1444d44b6b | Quick installer refactor with uninstall support | 2017-02-07 16:00:23 +01:00 |