Download as
Browse Code »

Commit f58201e9ba4e2ee9a68a16145e67e633722ca175

Authored by Perry Werneck
1 parent d9fe1101
Exists in master and in 2 other branches develop, script-support

Adjusments in win package.

Showing 1 changed file with 6 additions and 2 deletions   Show diff stats
@@ -129,13 +129,14 @@ prepare() @@ -129,13 +129,14 @@ prepare()
129 129
130 for spec in $(find ${WORKDIR}/sources/${1}/win/${ARCH} -name "*.spec") 130 for spec in $(find ${WORKDIR}/sources/${1}/win/${ARCH} -name "*.spec")
131 do 131 do
  132 + echo "Parsing ${spec}"
132 grep -i buildrequires "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' >> ${WORKDIR}/sources/pre-reqs 133 grep -i buildrequires "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' >> ${WORKDIR}/sources/pre-reqs
133 done 134 done
134 135
135 fi 136 fi
136 137
137 done 138 done
138 - 139 +
139 } 140 }
140 141
141 # 142 #
@@ -152,10 +153,13 @@ configure() @@ -152,10 +153,13 @@ configure()
152 echo "mingw32-cross-nsis" >> ${WORKDIR}/sources/pre-reqs 153 echo "mingw32-cross-nsis" >> ${WORKDIR}/sources/pre-reqs
153 154
154 cat ${WORKDIR}/sources/pre-reqs \ 155 cat ${WORKDIR}/sources/pre-reqs \
  156 + | cut -d'>' -f1 \
155 | grep -v 3270 \ 157 | grep -v 3270 \
156 | sort --unique \ 158 | sort --unique \
157 - | xargs sudo zypper --non-interactive --quiet in 159 + | xargs sudo zypper --non-interactive --verbose in --allow-vendor-change
158 160
  161 + /bin/bash
  162 +
159 fi 163 fi
160 164
161 echo -e "\e]2;Creating configuration\a" 165 echo -e "\e]2;Creating configuration\a"