Change to official PortableApps directory structure

.gitignore

@@ -1,4 +1,3 @@
 *.7z
-Documents
 ownCloudPortable
 *.log

App/AppInfo/Launcher/ownCloudPortable.ini

@@ -0,0 +1,27 @@
+[Launch]
+ProgramExecutable=encryption\start-hidden.bat
+DirectoryMoveOK=True
+CommandLineArguments="%PAL:Drive%\Documents\"
+WorkingDirectory=%PAL:AppDir%\encryption
+WaitForEXE1=ownCloudPortableEncryptionHelper.exe
+
+[Activate]
+Registry=True
+
+[RegistryKeys]
+ownCloudPortable=HKLM\SOFTWARE\ownCloud
+
+[DirectoriesMove]
+AppData=%USERPROFILE%\AppData\Local\ownCloud
+ProgramFiles=%ProgramFiles%\ownCloud
+-=%USERPROFILE%\ownCloud
+
+[DirectoriesCleanupIfEmpty]
+1=%USERPROFILE%\ownCloud
+
+[FileWrite1]
+Type=INI
+File=%PAL:DataDir%\AppData\folders\ownCloud
+Section=ownCloud
+Key=localPath
+Value=%PAL:Drive%/Documents/ownCloud/

App/AppInfo/appinfo.ini

@@ -0,0 +1,26 @@
+[Format]
+Type=PortableApps.comFormat
+Version=3.0
+
+[Details]
+Name=ownCloud Portable
+AppID=ownCloudPortable
+Publisher=ownCloud's Team, DylanTheSoldier, & PortableApps.com
+Homepage=http://portableapps.com/node/37132
+Category=Internet
+Description=ownCloud's Open-Source Client Software.
+Language=Multilingual
+
+[License]
+Shareable=true
+OpenSource=true
+Freeware=false
+CommercialUse=true
+
+[Version]
+PackageVersion=1.8.0.4893
+DisplayVersion=1.8
+
+[Control]
+Icons=1
+Start=ownCloudPortable.exe

App/AppInfo/installer.ini

@@ -0,0 +1,2 @@
+[DirectoriesToPreserve]
+PreserveDirectory1=Data

App/DefaultData/settings/ownCloudPortable.reg

@@ -0,0 +1,9 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ownCloud]
+@="C:\\Program Files\\ownCloud"
+"VersionMajor"=dword:00000001
+"VersionMinor"=dword:00000002
+"VersionRevision"=dword:00000000
+"VersionBuild"=dword:00000005
+

App/Readme.txt

@@ -0,0 +1,3 @@
+The files in this directory are necessary for the portable application to
+function.  There is normally no need to directly access or alter any of the
+files within these directories.

App/encryption/libs/Bat_To_Exe/settings.ini

@@ -0,0 +1,27 @@
+
+[lang]
+lang = 
+[files]
+bat = 
+exe = 
+[opt]
+ivi = 0
+dir = 0
+tmp = 0
+enc = 0
+pwd = 
+man = 0
+owr = 0
+cmp = 0
+x64 = 0
+[inc]
+ico = 
+[inf]
+ver = 0
+vr1 = 1,0,0,0
+vr2 = 1,0,0,0
+vr3 = 
+vr4 = 
+vr5 = 
+vr6 = 
+vr7 = 

App/encryption/start-hidden.bat

@@ -3,4 +3,4 @@
 :: Get the password
 powershell -Command $pword = read-host "Enter password" -AsSecureString ; $BSTR=[System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($pword) ; [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR) > .tmp.txt & set /p passwd=<.tmp.txt & del .tmp.txt
 
-wscript.exe hidden.vbs start.bat %passwd%
+wscript.exe hidden.vbs ownCloudPortableEncryptionHelper.exe %passwd% %1

App/encryption/start.bat

@@ -0,0 +1,39 @@
+::@echo off
+set CONFIG_ARCHIV="..\..\Data\config.7z"
+set DATA_ARCHIV="ownCloudData.7z"
+:: [ 0 | 1 | 3 | 5 | 7 | 9 ]
+set COMPRESSION=0
+set SEVENEXE="libs\7-Zip\7za.exe"
+set PASSWD=%1
+set RUNTIME_CONFIG_DIR=%USERPROFILE%\AppData\Local\ownCloud
+set PAPPS_DOCUMENTS_DIR=%2
+set RUNTIME_OWNCLOUD_DATA_DIR=%PAPPS_DOCUMENTS_DIR%ownCloud
+set LOG_FILE="..\..\Data\ownCloudPortableEncryption.log"
+
+echo This is the ownCloudPortable encryption starter script! > %LOG_FILE%
+echo Configuration: >> %LOG_FILE%
+echo \t CONFIG_ARCHIV = %CONFIG_ARCHIV% >> %LOG_FILE%
+echo \t DATA_ARCHIV = %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV% >> %LOG_FILE%
+
+if exist %CONFIG_ARCHIV% (
+	echo Extracting portable ownCloud client config and data... >> %LOG_FILE%
+	%SEVENEXE% x %CONFIG_ARCHIV% -o%RUNTIME_CONFIG_DIR% -p%PASSWD% -y >> %LOG_FILE%
+	%SEVENEXE% x %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV% -o%RUNTIME_OWNCLOUD_DATA_DIR% -r -p%PASSWD% -y >> %LOG_FILE%
+	del /s /f /q %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV%
+)
+
+echo Starting ownCloud client. >> %LOG_FILE%
+START /WAIT ..\ownCloud\ownCloud.exe >> %LOG_FILE%
+
+echo Encrypting ownCloud client config and data... >> %LOG_FILE%
+:: Explanation:
+::   -mhe to encrypt headers so nobody can browse the archive
+::   -mx0 to not compress the archiv (only for performance)
+%SEVENEXE% u %CONFIG_ARCHIV% %RUNTIME_CONFIG_DIR%\owncloud.cfg -mx%COMPRESSION% -mhe -p%PASSWD% -y >> %LOG_FILE%
+%SEVENEXE% a %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV% %RUNTIME_OWNCLOUD_DATA_DIR%\* -mx%COMPRESSION% -mhe -p%PASSWD% -y >> %LOG_FILE%
+
+echo Securely removing data from this computer... >> %LOG_FILE%
+del /s /f /q %RUNTIME_OWNCLOUD_DATA_DIR% & rd /s /q %RUNTIME_OWNCLOUD_DATA_DIR% >> %LOG_FILE%
+del /s /f /q %RUNTIME_CONFIG_DIR%\owncloud.cfg >> %LOG_FILE%
+
+:exit

App/ownCloud/CPack.GenericLicense.txt

@@ -0,0 +1,5 @@
+LICENSE
+=======
+
+This is an installer created using CPack (http://www.cmake.org). No license provided.
+