update

JasonYangShadow · Sep 9, 2019 · faf78f1 · faf78f1
1 parent 461e290
commit faf78f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2019090422
+2019090923
diff --git a/utils/utils.go b/utils/utils.go
@@ -847,15 +847,25 @@ func Untar(file string, folder string) *Error {
 			if strings.HasPrefix(header.Linkname, "/") {
 				os.Symlink(fmt.Sprintf("%s%s", strings.TrimSuffix(folder, "/"), header.Linkname), target)
 			} else {
-				os.Symlink(header.Linkname, target)
+				if strings.ContainsAny(header.Linkname, "/") {
+					os.Symlink(fmt.Sprintf("%s%s", folder, header.Linkname), target)
+				} else {
+					os.Symlink(header.Linkname, target)
+				}
 			}
 
 			//we should avoid of creating hard link
 		case tar.TypeLink:
 			if strings.HasPrefix(header.Linkname, "/") {
 				os.Symlink(fmt.Sprintf("%s%s", strings.TrimSuffix(folder, "/"), header.Linkname), target)
 			} else {
-				os.Symlink(header.Linkname, target)
+				//for some hard links they link to usr/bin/xxx
+				if strings.ContainsAny(header.Linkname, "/") {
+					os.Symlink(fmt.Sprintf("%s%s", folder, header.Linkname), target)
+				} else {
+					//only works on linking to the file inside the same folder
+					os.Symlink(header.Linkname, target)
+				}
 			}
 		}
 	}