Adjusments in win package.

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