@@ -34,13 +34,16 @@ validate_repo_address()
3434 http)
3535 TEST=" $( echo ${ADDR} | sed -ne ' /^http:\/\/.*$/p' ) "
3636 ;;
37+ https)
38+ TEST=" $( echo ${ADDR} | sed -ne ' /^https:\/\/.*$/p' ) "
39+ ;;
3740 ftp)
3841 TEST=" $( echo ${ADDR} | sed -ne ' /^ftp:\/\/.*$/p' ) "
3942 ;;
4043 nfs)
4144 # Ensure that there is no "http", "ftp" or "nfs" prefix.
4245 # (nfs just specifies mount arg, eg. "12.34.5.6:/foo/bar")
43- TEST=$( echo " ${ADDR} " | sed -e ' /^\(ftp\|http\|nfs\):/d' -ne ' /^[^:]\+:[^:]*$/p' )
46+ TEST=$( echo " ${ADDR} " | sed -e ' /^\(ftp\|http\|https\| nfs\):/d' -ne ' /^[^:]\+:[^:]*$/p' )
4447 ;;
4548 * ) # this shouldn't happen:
4649 return 1
@@ -88,12 +91,16 @@ get_default_string()
8891 DEFAULT_REPO=" $( echo ${ADDR} | sed -ne ' /^http:\/\//p' ) "
8992 [ ! -z " ${DEFAULT_REPO} " ] || DEFAULT_REPO=" http://foo.bar/baz"
9093 ;;
94+ https)
95+ DEFAULT_REPO=" $( echo ${ADDR} | sed -ne ' /^https:\/\//p' ) "
96+ [ ! -z " ${DEFAULT_REPO} " ] || DEFAULT_REPO=" https://foo.bar/baz"
97+ ;;
9198 ftp)
9299 DEFAULT_REPO=" $( echo ${ADDR} | sed -ne ' /^ftp:\/\//p' ) "
93100 [ ! -z " ${DEFAULT_REPO} " ] || DEFAULT_REPO=" ftp://foo.bar/baz"
94101 ;;
95102 nfs)
96- DEFAULT_REPO=" $( echo ${ADDR} | sed -e ' /^\(ftp\|http\):\/\//d' ) "
103+ DEFAULT_REPO=" $( echo ${ADDR} | sed -e ' /^\(ftp\|http\|https\ ):\/\//d' ) "
97104 [ ! -z " ${DEFAULT_REPO} " ] || DEFAULT_REPO=" 1.2.3.4:/foo/bar"
98105 ;;
99106 esac
@@ -129,7 +136,7 @@ parse_source_type()
129136 REPO=" $2 "
130137 SOURCE_TYPE=$( read_xml_attr " ${ANSF} " " source" " type" )
131138 case ${SOURCE_TYPE} in
132- url) echo " ${REPO} " | sed -ne ' s/^\(http\|ftp\):.*$/\1/p'
139+ url) echo " ${REPO} " | sed -ne ' s/^\(http\|https\| ftp\):.*$/\1/p'
133140 ;;
134141 nfs) echo " nfs"
135142 ;;
0 commit comments