| author | Sowrabha H G<sowrabha.hg@oracle.com> |
| Tue, 07 Apr 2015 05:03:48 -0700 | |
| changeset 4308 | 1df62dc45b69 |
| parent 3888 | 394d3b52b99a |
| permissions | -rw-r--r-- |
|
3888
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Adjust the quilt/setup script to do the equivalent of the GNU file -b option |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
This patch will be passed upstream |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- quilt/setup.in.orig 2015-02-16 16:11:48.761425804 -0800 |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ quilt/setup.in 2015-02-16 16:13:14.101523600 -0800 |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -162,7 +162,7 @@ |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
filetype="xz" |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
;; |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
*) |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
- filetype=$(file -b "$file") |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+ filetype=$(file "$file" | sed 's/^.*:[\t ]*//') |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
;; |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
esac |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
|
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
@@ -389,7 +389,7 @@ |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
"# Source: "*) |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
shift 2 |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
source="$@" |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
- filetype=$(file -b "$source") |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+ filetype=$(file "$source" | sed 's/^.*:[\t ]*//') |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
case "$filetype" in |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
Zip*) |
|
394d3b52b99a
20555320 quilt should be updated to version 0.64
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
echo "unzip ${tar_dir:-.} ${source// /\\ }"
|