Merge pull request #879 from linwumingshi/fix/gprc-mac-doc

Grant execute permissions for protoc-gen-doc on Linux/Mac OS

Author: shalousun

src/main/java/com/ly/doc/model/grpc/ProtoInfo.java

@@ -23,6 +23,7 @@
 import com.ly.doc.constants.DocGlobalConstants;
 
 import java.io.Serializable;
+import java.util.logging.Logger;
 
 /**
  * proto info.
@@ -31,6 +32,8 @@
  */
 public class ProtoInfo implements Serializable {
 
+	private static final Logger log = Logger.getLogger(ProtoInfo.class.getName());
+
 	private static final long serialVersionUID = 4962891140273167418L;
 
 	/**
@@ -84,6 +87,8 @@ private ProtoInfo() {
 		String os = System.getProperty("os.name").toLowerCase();
 		String arch = System.getProperty("os.arch").toLowerCase();
 
+		log.info("The os.name is:" + os + "and os.arch is: " + arch);
+
 		this.setTargetJsonDirectoryPath(targetJsonPath);
 		this.setJsonName("combined.json");
 		this.setTargetJsonFilePath(targetJsonPath + this.getJsonName());
@@ -93,7 +98,7 @@ private ProtoInfo() {
 			this.setSourcePaths("/protoc/win/protoc.exe", "/protoc/win/protoc-gen-doc.exe");
 		}
 		else if (os.contains("mac")) {
-			if (arch.contains("arm")) {
+			if (arch.contains("arm") || arch.contains("aarch")) {
 				this.setSourcePaths("/protoc/mac/arm/protoc", "/protoc/mac/arm/protoc-gen-doc");
 			}
 			else {

src/main/java/com/ly/doc/template/GRpcDocBuildTemplate.java

@@ -302,7 +302,7 @@ private void executeCommand(List<String> command, ProtoInfo protoInfo) {
 				// Grant execute permissions
 				Files.setPosixFilePermissions(Paths.get(protoInfo.getProtocPath()),
 						PosixFilePermissions.fromString("rwxr-xr-x"));
-				Files.setPosixFilePermissions(Paths.get(protoInfo.getProtocPath()),
+				Files.setPosixFilePermissions(Paths.get(protoInfo.getProtocGenDocPath()),
 						PosixFilePermissions.fromString("rwxr-xr-x"));
 			}
 		}