Diff of /trunk/mage-buildserver/buildserver-upload-smage.sh

Parent Directory | Revision Log | Patch

	revision 2770 by niro, Thu Aug 28 09:01:36 2014 UTC	revision 2773 by niro, Thu Aug 28 09:05:38 2014 UTC
#	Line 71  die()	Line 71  die()
71	load_mage_features	load_mage_features
72	mage_setup	mage_setup
73
74	if [ -f /var/cache/mage/smage/${SMAGEFILE} ]	if [ -f ${SMAGESCRIPTSDIR}/${SMAGEFILE} ]
75	then	then
76	smagesource /var/cache/mage/smage/${SMAGEFILE}	# be silent
77		FVERBOSE=off \
78		SILENT=1 \
79		smagesource ${SMAGESCRIPTSDIR}/${SMAGEFILE}
80	else	else
81	die "smagefile '/var/cache/mage/smage/${SMAGEFILE}' not found."	die "smagefile '${SMAGESCRIPTSDIR}/${SMAGEFILE}' not found."
82	fi	fi
83
84	if [[ ${BUILD_ARCH} = src ]]	if [[ ${BUILD_ARCH} = src ]]
#	Line 101  else	Line 104  else
104	export PNAME="${subpackage}"	export PNAME="${subpackage}"
105	split_info_${PNAME}	split_info_${PNAME}
106
107	TARGET_PKGFILE+=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )	TARGET_PKGFILE+=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
108
109	# restore smage environment	# restore smage environment
110	split_restore_variables	split_restore_variables
#	Line 109  else	Line 112  else
112	# unset all saved smage variables	# unset all saved smage variables
113	split_unset_variables	split_unset_variables
114	else	else
115	TARGET_PKGFILE=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )	TARGET_PKGFILE=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
116	fi	fi
117
118	for i in ${TARGET_PKGFILE}	for i in ${TARGET_PKGFILE[*]}
119	do	do
120	if [ ! -f ${i} ]	if [ ! -f ${i} ]
121	then	then

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2770   changed lines   Added in v.2773