Merge branch 'release/0.4.1-alpha'

vwiencek · Jan 9, 2015 · c98d715 · c98d715
2 parents 53acb09 + b87063b
commit c98d715
Show file tree

Hide file tree

Showing 542 changed files with 5,738 additions and 3,988 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -6,7 +6,6 @@ Active Team Members:
 - Christian Roth (cr0)
 - Philipp C. Heckel (binwiederhier, [email protected]) 
 - Pim Otte (pimotte, [email protected])
-- Vincent Wiencek (vwiencek)
 
 Contributors / Former Team Members:
 - Alexandre Viau (ReAzem)
@@ -23,9 +22,11 @@ Contributors / Former Team Members:
 - Marius Voilă
 - MatMaul
 - Nikolai Hellwig
-- Stefan Mai
+- Stefan Mai (iamnafets)
+- Stefan Hugtenburg (MrHug)
 - Steffen Dangmann (guitarlum)
 - spikeh
 - Olivier Tisun
 - Paul Steinhilber
 - Vadim Panin (vadimpanin)
+- Vincent Wiencek (vwiencek)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,24 @@
 Change Log
 ==========
 
+### Syncany 0.4.1-alpha (Date: 10 Jan 2015)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Features and significant changes:
+  + New 'Preferences' dialog with ability to remove/add plugins, 
+    enable/disable notifications, and change the proxy settings #334/#321
+  + New 'Remove folder' feature in tray menu #330
+  + New 'Copy link' feature in tray menu #336
+  + Added recent changes command 'sy log' #298
+- Bugfixes and other things:
+  + Fix Dropbox plugin bug when deleting non-existing files #325
+  + Cleanup status information / status texts in tray #317/#329
+  + Code refactoring based on SonarQube output #302/#326
+  + Fix invalid "uploading" status message #314
+  + Fix confusing error message when plugin not installed #328
+  + Fix sync-forever issue with Windows watcher #338
+  + Removed `<hooks>` and `<runAfterDown>` because largly unused #311
+  + Fix `sy ls` doesn't display deleted file versions; add `--deleted` #282
+
 ### Syncany 0.4.0-alpha (Date: 28 Dec 2014)
 - Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
 - Features and significant changes:

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ apply from: 'gradle/gradle/helpers.gradle'
 // Global Settings /////////////////////////////////////////////////////////////
 
 project.ext {
-	applicationVersion = "0.4.0-alpha"
+	applicationVersion = "0.4.1-alpha"
 	applicationVersionDebian = "1";
 
 	applicationRelease = isApplicationRelease()

diff --git a/gradle/arch/syncany/PKGBUILD b/gradle/arch/syncany/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Pim Otte <otte dot pim at gmail dot com>
 pkgname=syncany
-pkgver=0.3.0_alpha
-_realver=0.3.0-alpha
-pkgrel=1
+pkgver=0.4.0_alpha
+_realver=0.4.0-alpha
+pkgrel=2
 pkgdesc="Cloud storage and filesharing application with a focus on security and abstraction of storage."
 arch=(any)
 url="http://www.syncany.org/"
@@ -11,9 +11,9 @@ depends=('java-runtime>=7' 'bash-completion')
 source=("http://syncany.org/dist/$pkgname-${_realver}.tar.gz"
         syncany
         syncany.bash-completion)
-sha256sums=('158e31a99d6c9b877dbd7ad72ec10cf9ea39f55e53e1cda401ca1941d73fb105'
-            'df627b5306967f6e0d9a4bf264bdac44caee14ff8e9e7df93fc291339a1d353e'
-            '043bdc2bb47fad48a5d8ca6cd612faf5b8d00bd66677f4cea99dde84c129e209')
+sha256sums=('cdd34cbfc8201de9615bc0c829d7f9b7c777aee390afe0ac05cdfd398b267550'
+            '6f63daf343a8288487bd916189ac05f99464a9892121ec053e410498c0f63b16'
+            'f2458567e2686fb8fb596a5dd9de5f3af3c8eaba1f39fd6157f67806cca5ec99')
 
 package() {
     install -Dm755 syncany "${pkgdir}/usr/bin/syncany"
@@ -25,5 +25,5 @@ package() {
     done
 
     #Optional: symlink sy
-    #ln -s ${pkgdir}/usr/bin/syncany /usr/bin/sy
+    #ln -s /usr/bin/syncany ${pkgdir}/usr/bin/sy
 }
diff --git a/gradle/arch/syncany/syncany b/gradle/arch/syncany/syncany
@@ -1,22 +1,21 @@
 #!/bin/sh
 
 for name in /usr/share/java/syncany/*.jar ; do
-  CP=$CP:$name
+  CLASSPATH=$CLASSPATH:$name
 done
 
 for name in $HOME/.config/syncany/plugins/lib/*.jar ; do
-  CP=$CP:$name
+  CLASSPATH=$CLASSPATH:$name
 done
 
-
 ### Daemon script begin #########################################SYNCANY_INCL_4#
 
 # Daemon variables
 DAEMON_NAME=syncanyd
 DAEMON_APPDIR=~/.config/syncany
 DAEMON_CONTROLFILE=$DAEMON_APPDIR/daemon.ctrl
 DAEMON_PIDFILE=$DAEMON_APPDIR/daemon.pid
-DAEMON_CMD="daemon"
+DAEMON_CMD="daemon run"
 
 # Daemon functions
 daemon_get_pid() {
@@ -46,7 +45,7 @@ daemon_start() {
 	if [ $DAEMON_RUNNING -eq 1 ]; then
 		echo "$DAEMON_NAME already running (pid $DAEMON_PID)"
 	else
-        nohup "$JAVA_HOME/bin/java" -cp $CP org.syncany.Syncany "$DAEMON_CMD"> /dev/null 2>&1 &
+	    nohup "$JAVA_HOME/bin/java" -classpath "$CLASSPATH" org.syncany.Syncany $DAEMON_CMD > /dev/null 2>&1 &
 
 		DAEMON_PID=-1
 		TRIES=10
@@ -152,9 +151,12 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 mkdir -p $DAEMON_APPDIR
 DAEMON_PID=$(daemon_get_pid)
 
-case "$1" in                 
+case "$1" in      
 	daemon)                   
 		case "$2" in         
+			"")
+				echo "Usage: sy daemon (start|stop|reload|status|force-stop|add|remove|list)"
+				;;        
 			start) 
 				daemon_start
 				;;     
@@ -175,12 +177,12 @@ case "$1" in
 				daemon_force_stop
 				;; 
 			*) 
-				echo "Usage: sy daemon (start/stop/reload/status/force-stop)"
+                exec "$JAVA_HOME/bin/java" -classpath $CLASSPATH org.syncany.Syncany "$@"
 				;;
 		esac
 		;;  
 
-	*)                       
-        exec "$JAVA_HOME/bin/java" -cp $CP org.syncany.Syncany "$@"
+	*)
+        exec "$JAVA_HOME/bin/java" -classpath $CLASSPATH org.syncany.Syncany "$@"
 		;;
-esac
+esac