Commit31aeac0

committed

review

1 parent26c3593 commit31aeac0Copy full SHA for 31aeac0

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ $(XCPROJECT): $(PROJECT)/project.yml`
`75`	`75`	`$(PROJECT)/VPNLib/vpn.pb.swift:$(PROJECT)/VPNLib/vpn.proto`
`76`	`76`	`protoc --swift_opt=Visibility=public --swift_out=.'Coder-Desktop/VPNLib/vpn.proto'`
`77`	`77`
`78`		`-# All other protobuf targets are vendored from Mutagen`
`79`		`-%.pb.swift:`
	`78`	`+$(MUTAGEN_PROTO_SWIFTS):`
`80`	`79`	`protoc\`
`81`	`80`	`-I=$(PROJECT)/VPNLib/FileSync/MutagenSDK\`
`82`	`81`	`--swift_out=$(PROJECT)/VPNLib/FileSync/MutagenSDK\`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ fi`
`49`	`49`	`# Extract MIT License header`
`50`	`50`	`mit_start_line=$(grep -n"^MIT License""$clone_dir/LICENSE"\| cut -d":" -f 1)`
`51`	`51`	`if [-z"$mit_start_line" ];then`
`52`		`-echo"Failed to find MIT License header in Mutagen LICENSE file"`
	`52`	`+echo"Error:Failed to find MIT License header in Mutagen LICENSE file"`
`53`	`53`	`exit 1`
`54`	`54`	`fi`
`55`	`55`	`license_header=$(sed -n"${mit_start_line},\$p""$clone_dir/LICENSE"\| sed's/^/ * /')`
`@@ -87,7 +87,8 @@ add_file() {`
`87`	`87`	`if [-f"$import_file_path" ];then`
`88`	`88`	`add_file"$import_file_path"`
`89`	`89`	`else`
`90`		`-echo"Warning: Import$import_path not found"`
	`90`	`+echo"Error: Import$import_path not found"`
	`91`	`+exit 1`
`91`	`92`	`fi`
`92`	`93`	`fi`
`93`	`94`	`done<"$filepath"`
`@@ -96,7 +97,7 @@ add_file() {`
`96`	`97`	`forentry_filein"${entry_files[@]}";do`
`97`	`98`	`entry_file_path="$clone_dir/$proto_prefix/$entry_file"`
`98`	`99`	`if [!-f"$entry_file_path" ];then`
`99`		`-echo"Failed to find$entry_file_path in mutagen repo"`
	`100`	`+echo"Error:Failed to find$entry_file_path in mutagen repo"`
`100`	`101`	`exit 1`
`101`	`102`	`fi`
`102`	`103`	`add_file"$entry_file_path"`

Comments

(0)