Compare commits

..

No commits in common. "ea221aa95fd6acf07dbbfc9b1d4c5492bfbacb0d" and "6856ac0eba9d76e211d2412814186c8d3c4d7a46" have entirely different histories.

4 changed files with 43 additions and 52 deletions

View File

@ -115,41 +115,41 @@ dist:
source: source:
rm -rf $(source_build_directory) rm -rf $(source_build_directory)
mkdir -p $(source_build_directory) mkdir -p $(source_build_directory)
tar cvzf $(source_package_name).tar.gz ../$(app_name) tar cvzf $(source_package_name).tar.gz ../$(app_name) \
# --exclude-vcs \ --exclude-vcs \
# --exclude="../$(app_name)/build" \ --exclude="../$(app_name)/build" \
# --exclude="../$(app_name)/js/node_modules" \ --exclude="../$(app_name)/js/node_modules" \
# --exclude="../$(app_name)/node_modules" \ --exclude="../$(app_name)/node_modules" \
# --exclude="../$(app_name)/*.log" \ --exclude="../$(app_name)/*.log" \
# --exclude="../$(app_name)/js/*.log" \ --exclude="../$(app_name)/js/*.log" \
# Builds the source package for the app store, ignores php and js tests # Builds the source package for the app store, ignores php and js tests
.PHONY: appstore .PHONY: appstore
appstore: appstore:
rm -rf $(appstore_build_directory) rm -rf $(appstore_build_directory)
mkdir -p $(appstore_build_directory) mkdir -p $(appstore_build_directory)
tar cvzf $(appstore_package_name).tar.gz ../$(app_name) tar cvzf $(appstore_package_name).tar.gz ../$(app_name) \
# --exclude-vcs \ --exclude-vcs \
# --exclude="../$(app_name)/build" \ --exclude="../$(app_name)/build" \
# --exclude="../$(app_name)/tests" \ --exclude="../$(app_name)/tests" \
# --exclude="../$(app_name)/Makefile" \ --exclude="../$(app_name)/Makefile" \
# --exclude="../$(app_name)/*.log" \ --exclude="../$(app_name)/*.log" \
# --exclude="../$(app_name)/phpunit*xml" \ --exclude="../$(app_name)/phpunit*xml" \
# --exclude="../$(app_name)/composer.*" \ --exclude="../$(app_name)/composer.*" \
# --exclude="../$(app_name)/js/node_modules" \ --exclude="../$(app_name)/js/node_modules" \
# --exclude="../$(app_name)/js/tests" \ --exclude="../$(app_name)/js/tests" \
# --exclude="../$(app_name)/js/test" \ --exclude="../$(app_name)/js/test" \
# --exclude="../$(app_name)/js/*.log" \ --exclude="../$(app_name)/js/*.log" \
# --exclude="../$(app_name)/js/package.json" \ --exclude="../$(app_name)/js/package.json" \
# --exclude="../$(app_name)/js/bower.json" \ --exclude="../$(app_name)/js/bower.json" \
# --exclude="../$(app_name)/js/karma.*" \ --exclude="../$(app_name)/js/karma.*" \
# --exclude="../$(app_name)/js/protractor.*" \ --exclude="../$(app_name)/js/protractor.*" \
# --exclude="../$(app_name)/package.json" \ --exclude="../$(app_name)/package.json" \
# --exclude="../$(app_name)/bower.json" \ --exclude="../$(app_name)/bower.json" \
# --exclude="../$(app_name)/karma.*" \ --exclude="../$(app_name)/karma.*" \
# --exclude="../$(app_name)/protractor\.*" \ --exclude="../$(app_name)/protractor\.*" \
# --exclude="../$(app_name)/.*" \ --exclude="../$(app_name)/.*" \
# --exclude="../$(app_name)/js/.*" \ --exclude="../$(app_name)/js/.*" \
.PHONY: test .PHONY: test
test: composer test: composer

Binary file not shown.

View File

@ -8,14 +8,6 @@
var baseUrl = OC.generateUrl('/apps/occweb'); var baseUrl = OC.generateUrl('/apps/occweb');
$.get(baseUrl + '/cmd', function(response){ $.get(baseUrl + '/cmd', function(response){
$('#app-content').terminal(function(command, term) { $('#app-content').terminal(function(command, term) {
switch (command) {
case "c":
this.clear();
break;
case "exit":
this.reset();
break;
default:
var occCommand = { var occCommand = {
command: command command: command
}; };
@ -26,11 +18,10 @@
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify(occCommand) data: JSON.stringify(occCommand)
}).done(function (response) { }).done(function (response) {
term.echo('\n' + response).resume(); term.echo('\n'+ response).resume();
}).fail(function (response, code) { }).fail(function (response, code) {
term.echo('\n' + response).resume(); term.echo('\n' + response).resume();
}); });
}
}, { }, {
greetings: '[[;green;]' + new Date().toString().slice(0, 24) + "]\n\nPress [[;#ff5e99;]Enter] for more information on [[;#009ae3;]occ] commands.\n", greetings: '[[;green;]' + new Date().toString().slice(0, 24) + "]\n\nPress [[;#ff5e99;]Enter] for more information on [[;#009ae3;]occ] commands.\n",
name: 'occ', name: 'occ',