Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Switch from GPL2 to Apache2 license

  • Loading branch information...
commit 90a733bc23c8e9ae8791c6da1e2bbb064ed7a7d0 1 parent 0743526
@robogeek robogeek authored
Showing with 59 additions and 31 deletions.
  1. +31 −1 cli.js
  2. +9 −10 index.js
  3. +10 −10 lib/gatherfiles.js
  4. +9 −10 lib/renderer.js
View
32 cli.js
@@ -1,11 +1,31 @@
#!/usr/bin/env node
+/**
+ *
+ * Copyright 2012 David Herron
+ *
+ * This file is part of AkashaCMS (http://akashacms.com/).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
// akasha init dirName -- initialize new directory
// akasha build
// akasha serve
var util = require('util');
var spawn = require('child_process').spawn;
+var exec = require('child_process').exec;
var http = require('http');
var program = require('commander');
var akasha = require('akashacms');
@@ -19,8 +39,18 @@ program
program
.command('init <dirName>')
- .description('initialize a akashacms site')
+ .description('initialize an akashacms site')
.action(function(dirName){
+ /*var git = exec(
+ 'git clone git://github.com/robogeek/akashacms-example.git' + dirName,
+ {env: process.env, stdio: 'inherit'},
+ function (error, stdout, stderr) {
+ console.log('stdout: ' + stdout);
+ console.log('stderr: ' + stderr);
+ if (error !== null) {
+ console.log('exec error: ' + error);
+ }
+ });*/
var git = spawn('git',
[ 'clone', 'git://github.com/robogeek/akashacms-example.git', dirName],
{env: process.env, stdio: 'inherit'});
View
19 index.js
@@ -5,18 +5,17 @@
*
* This file is part of AkashaCMS (http://akashacms.com/).
*
- * AkashaCMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * AkashaCMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with AkashaCMS. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
var async = require('async');
View
20 lib/gatherfiles.js
@@ -5,18 +5,18 @@
*
* This file is part of AkashaCMS (http://akashacms.com/).
*
- * AkashaCMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * AkashaCMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * You should have received a copy of the GNU General Public License
- * along with AkashaCMS. If not, see <http://www.gnu.org/licenses/>.
*/
var fs = require('fs');
View
19 lib/renderer.js
@@ -5,18 +5,17 @@
*
* This file is part of AkashaCMS (http://akashacms.com/).
*
- * AkashaCMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * AkashaCMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with AkashaCMS. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
var fs = require('fs');
Please sign in to comment.
Something went wrong with that request. Please try again.