Skip to content

Commit 5a0c6ba

Browse files
committed
Merge branch 'cremich-bugfix/github-branch-namings'
2 parents feed9a9 + 997cdab commit 5a0c6ba

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "cdkp",
33
"description": "CLI tool for cdk patterns",
4-
"version": "0.6.1",
4+
"version": "0.7.0",
55
"author": "cdkpatterns",
66
"bin": {
77
"cdkp": "./bin/run"

src/commands/init.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export default class Init extends Command {
1111
`$ cdkp init the-big-fan
1212
*** Downloading Pattern ***
1313
From https://github.com/cdk-patterns/serverless
14-
* [new branch] master -> origin/master
14+
* [new branch] main -> origin/main
1515
From https://github.com/cdk-patterns/serverless
16-
* branch master -> FETCH_HEAD
16+
* branch main -> FETCH_HEAD
1717
*** Tidying up file structure ***
1818
*** Installing Dependencies and Building ***
1919
npm WARN the-big-fan@0.1.0 No repository field.
@@ -75,7 +75,7 @@ export default class Init extends Command {
7575
execSync('git remote add origin -f https://github.com/cdk-patterns/serverless', {'cwd': pattern});
7676
execSync('git config core.sparsecheckout true', {'cwd': pattern});
7777
execSync('echo '+pattern+'/'+lang+' >> .git/info/sparse-checkout', {'cwd': pattern});
78-
execSync('git pull origin master', {'cwd': pattern});
78+
execSync('git pull origin main', {'cwd': pattern});
7979

8080
this.log('*** Tidying up file structure ***');
8181
fs.removeSync(path.join(base_dir, '.git'))
@@ -109,7 +109,7 @@ export default class Init extends Command {
109109

110110
private getAvailablePatterns():Promise<string[]> {
111111
return new Promise<string[]>((resolve, reject) => {
112-
https.get('https://raw.githubusercontent.com/cdk-patterns/serverless/master/info.json', (resp:any) => {
112+
https.get('https://raw.githubusercontent.com/cdk-patterns/serverless/main/info.json', (resp:any) => {
113113
let data = '';
114114

115115
// A chunk of data has been recieved.

src/commands/list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default class List extends Command {
2323

2424
let that = this;
2525

26-
https.get('https://raw.githubusercontent.com/cdk-patterns/serverless/master/info.json', (resp:any) => {
26+
https.get('https://raw.githubusercontent.com/cdk-patterns/serverless/main/info.json', (resp:any) => {
2727
let data = '';
2828

2929
// A chunk of data has been recieved.

0 commit comments

Comments
 (0)