From 38d3a6e10459e8d1815c7e2f187affff43a05395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Schneider?= Date: Mon, 14 May 2012 08:20:42 +0200 Subject: [PATCH] Corrected an error message; added an empty version of the DB file Former-commit-id: ea83e030e3ac4dfb998ea1e4bf7ad09993da7974 --- .../0.2.0/Frameworks/Baikal/Core/Tools.php | 6 +++--- .../Frameworks/Baikal/Scripts/package-flat.sh | 7 +++++-- CoreVersions/0.2.0/Resources/db.empty.sqlite | Bin 0 -> 14336 bytes 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100755 CoreVersions/0.2.0/Resources/db.empty.sqlite diff --git a/CoreVersions/0.2.0/Frameworks/Baikal/Core/Tools.php b/CoreVersions/0.2.0/Frameworks/Baikal/Core/Tools.php index 76f5855..fce5221 100755 --- a/CoreVersions/0.2.0/Frameworks/Baikal/Core/Tools.php +++ b/CoreVersions/0.2.0/Frameworks/Baikal/Core/Tools.php @@ -61,17 +61,17 @@ class Tools { # Asserting DB file exists if(!file_exists(PROJECT_SQLITE_FILE)) { - throw new \Exception("DB file does not exist. To create it, please copy 'Core/Resources/baikal.empty.sqlite' to 'Specific/db/baikal.sqlite'."); + throw new \Exception("DB file does not exist. To create it, please copy 'Core/Resources/db.empty.sqlite' to 'Specific/db/.ht.db.sqlite'"); } # Asserting DB file is readable if(!is_readable(PROJECT_SQLITE_FILE)) { - throw new \Exception("DB file is not readable. Please give read permissions to httpd user on file 'Specific/db/baikal.sqlite'."); + throw new \Exception("DB file is not readable. Please give read permissions to httpd user on file 'Specific/db/.ht.db.sqlite'."); } # Asserting DB file is writable if(!is_writable(PROJECT_SQLITE_FILE)) { - throw new \Exception("DB file is not writable. Please give write permissions to httpd user on file 'Specific/db/baikal.sqlite'."); + throw new \Exception("DB file is not writable. Please give write permissions to httpd user on file 'Specific/db/.ht.db.sqlite'."); } # Asserting config file exists diff --git a/CoreVersions/0.2.0/Frameworks/Baikal/Scripts/package-flat.sh b/CoreVersions/0.2.0/Frameworks/Baikal/Scripts/package-flat.sh index edaedae..68b804a 100755 --- a/CoreVersions/0.2.0/Frameworks/Baikal/Scripts/package-flat.sh +++ b/CoreVersions/0.2.0/Frameworks/Baikal/Scripts/package-flat.sh @@ -8,13 +8,16 @@ echo "# by their target). Useful for FTP deployment" echo "#" echo "#" -BRANCH="mongoose" +BRANCH="master" TARGETFILE="/tmp/package.zip" +SRCDIR="/Users/jeromeschneider/Desktop/Baikal/" TEMPDIR="/tmp/baikal-flat-`date +%Y-%m-%d-%H-%M-%S`-temp" TEMPDIRDEREFERENCE="/tmp/baikal-flat-`date +%Y-%m-%d-%H-%M-%S`" # Export Project -mkdir $TEMPDIR && cd ../../../../ && git archive $BRANCH | tar -x -C $TEMPDIR +mkdir $TEMPDIR +cd $SRCDIR +git archive $BRANCH | tar -x -C $TEMPDIR # Dereferencig symlinks cp -RfL $TEMPDIR $TEMPDIRDEREFERENCE && \ diff --git a/CoreVersions/0.2.0/Resources/db.empty.sqlite b/CoreVersions/0.2.0/Resources/db.empty.sqlite new file mode 100755 index 0000000000000000000000000000000000000000..13096315e9f5d8eb15121931a1778aca576f3d4c GIT binary patch literal 14336 zcmeHM!EVz)5Veyuu3cIQE*1yWEux}P%OUCksZu3EiK?olqG^igDcacEU}AfNcOzOP z4hi4FgzIs=rcdKjd2GvC;$rFq5@iB zF^rb%>RXHsp+EspAX^2X|FhK}qJsiiDggbTrTP#X6v$Qq=>Kf>hv=X{mI^@sXQ@8K z1_iQJAngBwa;YenYCl)X{mK^2jiUEnshYXEs`mFeZn^~9c0d?wQrc$8ac-wpt<{I_1!|KEgqgL0q=T^fmeav*H*gRq=RC684(qu1 z!p9y-nulKUWt%W7a5~(f{=mu5Esk4pNTbwylG9AnRQpdQ4GRZ0lb3u7xHO?PWaty| zCOD3KBh2A4Hs%;LUD}LnL%;*NE@s@LwsYo?p)vyIPF^$D*VX=Z1k)wHjRV^JKrAi* zr>2F!pr;=GABlLy31DNle~4bsqQ6wo%;jbEYdghah@Z_}i=0ipR8mC|*Vi?r6YCt< zqFkf0-H?SAD`8QW263rz$0MJqAJwNQJ?eGD)aOik7^SfPHRVcCuGDY2tsKoi%D>J3 zxKSV83FqF{+@Q;jW#V0GwVAvWQwf)*$pxy@PrlGU+6(khW!mM#e26Bs0)qLde?&%g zPTM5f1H_D3v_q0_*rdbXCk=61ir#xr)XbF?wMQlR;eNzMBRxf9WEX`SZWw!q_3Cc5 zhThcnURP?TXuo=jD#tq^tT0Ty`mVlV=)}X08&8tETlD=LdWCL&>BS&~C>gUXuhYIbKMyNj{mt$Iyqt z8Y9|*+8{{U7STz*v4Mt;g5q<%Xzs6$qnL!%C?{w4z8JFDdZ&_QmkE0EvY6r}O%b8- zCy*Yx$ulO(g6*^j3D9hUt{Qkca+ZTWY1*W2a5v~gV z|4&6*SQHePbp_!3pY;p@K2TtK3c&e4J#ArSP+-;-fb)OWGX(fRf$1p#=l}Gyg_S{p HSy$i>7M>oG literal 0 HcmV?d00001