Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 6c6bd0c

Browse files
committed
Typo in column name
Force updating gui.ajax if any modification detected
1 parent 8c010ef commit 6c6bd0c

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

dist/phing/build-pydio.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@
146146
<property name="passed_directory" value="${INNER_DIRECTORY}"/>
147147
</phingcall>
148148

149-
<!-- BUILD JAVASCRIPT -->
150-
<exec command="npm install" dir="${INNER_DIRECTORY}/plugins/gui.ajax" passthru="true"/>
149+
<!-- BUILD JAVASCRIPT -->
150+
<exec command="npm install" dir="${INNER_DIRECTORY}/plugins/gui.ajax" passthru="true"/>
151151
<exec command="grunt" dir="${INNER_DIRECTORY}/plugins/gui.ajax" passthru="true"/>
152-
<delete dir="${INNER_DIRECTORY}/plugins/gui.ajax/node_modules"/>
152+
<delete dir="${INNER_DIRECTORY}/plugins/gui.ajax/node_modules"/>
153153

154154
<!-- DISCRIMINATE PLUGINS -->
155155
<mkdir dir="${build.working_folder}/ext_plugins" />
@@ -181,6 +181,19 @@
181181
<property name="passed_directory" value="${upgrade_export}"/>
182182
</phingcall>
183183

184+
<if>
185+
<available type="dir" file="${upgrade_export}/plugins/gui.ajax"/>
186+
<then>
187+
<echo message="Copying full gui.ajax folder" level="info"/>
188+
<property name="new_package_name" value="${build.source_folder}/pydio-core-${build.version}"/>
189+
<copy todir="${upgrade_export}/plugins/gui.ajax">
190+
<fileset dir="${new_package_name}/plugins/gui.ajax" defaultexcludes="false">
191+
<include name="*/**"/>
192+
</fileset>
193+
</copy>
194+
</then>
195+
</if>
196+
184197
<!-- COPY RELEASE NOTE -->
185198
<copy file="${upgrade_export}/conf/RELEASE_NOTE" toFile="${upgrade_export}/UPGRADE/NOTE"/>
186199
<copy file="${git.local_repository}/core/src/conf/VERSION" toFile="${upgrade_export}/conf/VERSION">

dist/php/6.1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ ALTER TABLE `ajxp_log`
1414
;
1515
/* SEPARATOR */
1616
ALTER TABLE `ajxp_roles`
17-
ADD COLUMN `last_udpated` INT(11) NOT NULL DEFAULT 0,
18-
ADD INDEX (`last_udpated`)
17+
ADD COLUMN `last_updated` INT(11) NOT NULL DEFAULT 0,
18+
ADD INDEX (`last_updated`)

0 commit comments

Comments
 (0)