Kaynağa Gözat

I suck at coding.

tags/0.6.3m1rc3
Shane Mc Cormack 15 yıl önce
ebeveyn
işleme
e59720cb07
2 değiştirilmiş dosya ile 11 ekleme ve 9 silme
  1. 4
    3
      installer/jar/makeJar.sh
  2. 7
    6
      installer/release.sh

+ 4
- 3
installer/jar/makeJar.sh Dosyayı Görüntüle

56
 	echo "-e, --extra <tag>         Tag to add to final name to distinguish this build from a standard build"
56
 	echo "-e, --extra <tag>         Tag to add to final name to distinguish this build from a standard build"
57
 	echo "-k, --keep                Keep the existing source tree when compiling"
57
 	echo "-k, --keep                Keep the existing source tree when compiling"
58
 	echo "                          (don't svn update beforehand)"
58
 	echo "                          (don't svn update beforehand)"
59
-	echo "-c   --channel [channel]  Channel to pass to ant (if not passed, 'NONE', if passed without a value, 'STABLE')"
59
+	echo "    --channel [channel]  Channel to pass to ant (if not passed, 'NONE', if passed without a value, 'STABLE')"
60
 	echo "---------------------"
60
 	echo "---------------------"
61
 	exit 0;
61
 	exit 0;
62
 }
62
 }
130
 				TAGGED=${TAGGED%%-*}
130
 				TAGGED=${TAGGED%%-*}
131
 			fi;
131
 			fi;
132
 			;;
132
 			;;
133
-		--channel|-c)
133
+		--channel)
134
 			shift
134
 			shift
135
 			PASSEDPARAM=`echo "${1}" | grep ^-`
135
 			PASSEDPARAM=`echo "${1}" | grep ^-`
136
 			if [ "${PASSEDPARAM}" == "" ]; then
136
 			if [ "${PASSEDPARAM}" == "" ]; then
179
 				svn update
179
 				svn update
180
 			fi;
180
 			fi;
181
 		fi
181
 		fi
182
-		ant -Dchannel=${CHANNEL} clean jar
182
+		echo ant -Dchannel=${CHANNEL} clean jar
183
+		exit 1;
183
 		if [ ! -e "dist/DMDirc.jar" ]; then
184
 		if [ ! -e "dist/DMDirc.jar" ]; then
184
 			echo "There was an error creating the .jar file. Aborting."
185
 			echo "There was an error creating the .jar file. Aborting."
185
 			exit 1;
186
 			exit 1;

+ 7
- 6
installer/release.sh Dosyayı Görüntüle

113
 			BRANCH="-b "
113
 			BRANCH="-b "
114
 			;;
114
 			;;
115
 		--tag|-t)
115
 		--tag|-t)
116
-			shift
117
 			if [ ${isSVN} -eq 1 ]; then
116
 			if [ ${isSVN} -eq 1 ]; then
117
+				shift
118
 				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
118
 				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
119
 				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
119
 				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
120
 				if [ "" = "${CHECKTAG}" ]; then
120
 				if [ "" = "${CHECKTAG}" ]; then
128
 			;;
128
 			;;
129
 		--channel|-c)
129
 		--channel|-c)
130
 			shift
130
 			shift
131
-			PASSEDPARAM=`echo "${1}" | grep ^-`
132
-			if [ "${PASSEDPARAM}" == "" ]; then
131
+			PASSEDPARAM=`echo "${1}" | grep -v ^-`
132
+			if [ "${PASSEDPARAM}" != "" ]; then
133
 				shift;
133
 				shift;
134
-				CHANNEL="-c \"${PASSEDPARAM}\" ";
134
+				CHANNEL="--channel \"${PASSEDPARAM}\" ";
135
 			else
135
 			else
136
-				CHANNEL="-c STABLE ";
136
+				CHANNEL="--channel STABLE ";
137
 			fi;
137
 			fi;
138
 			;;
138
 			;;
139
 	esac
139
 	esac
252
 	echo "Building Release Jar"
252
 	echo "Building Release Jar"
253
 	echo "================================================================"
253
 	echo "================================================================"
254
 	cd jar
254
 	cd jar
255
-	./makeJar.sh ${CHANNEL}${OPT}${JARFILE}${JRE}-c -k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins}"
255
+	echo ./makeJar.sh ${CHANNEL}${OPT}${JARFILE}${JRE}-c -k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins}"
256
+	exit 1;
256
 	RESULT=${?}
257
 	RESULT=${?}
257
 	cd ${THISDIR}
258
 	cd ${THISDIR}
258
 
259
 

Loading…
İptal
Kaydet