소스 검색

I suck at coding.

tags/0.6.3m1rc3
Shane Mc Cormack 15 년 전
부모
커밋
e59720cb07
2개의 변경된 파일11개의 추가작업 그리고 9개의 파일을 삭제
  1. 4
    3
      installer/jar/makeJar.sh
  2. 7
    6
      installer/release.sh

+ 4
- 3
installer/jar/makeJar.sh 파일 보기

@@ -56,7 +56,7 @@ showHelp() {
56 56
 	echo "-e, --extra <tag>         Tag to add to final name to distinguish this build from a standard build"
57 57
 	echo "-k, --keep                Keep the existing source tree when compiling"
58 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 60
 	echo "---------------------"
61 61
 	exit 0;
62 62
 }
@@ -130,7 +130,7 @@ while test -n "$1"; do
130 130
 				TAGGED=${TAGGED%%-*}
131 131
 			fi;
132 132
 			;;
133
-		--channel|-c)
133
+		--channel)
134 134
 			shift
135 135
 			PASSEDPARAM=`echo "${1}" | grep ^-`
136 136
 			if [ "${PASSEDPARAM}" == "" ]; then
@@ -179,7 +179,8 @@ if [ "" = "${jarfile}" ]; then
179 179
 				svn update
180 180
 			fi;
181 181
 		fi
182
-		ant -Dchannel=${CHANNEL} clean jar
182
+		echo ant -Dchannel=${CHANNEL} clean jar
183
+		exit 1;
183 184
 		if [ ! -e "dist/DMDirc.jar" ]; then
184 185
 			echo "There was an error creating the .jar file. Aborting."
185 186
 			exit 1;

+ 7
- 6
installer/release.sh 파일 보기

@@ -113,8 +113,8 @@ while test -n "$1"; do
113 113
 			BRANCH="-b "
114 114
 			;;
115 115
 		--tag|-t)
116
-			shift
117 116
 			if [ ${isSVN} -eq 1 ]; then
117
+				shift
118 118
 				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
119 119
 				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
120 120
 				if [ "" = "${CHECKTAG}" ]; then
@@ -128,12 +128,12 @@ while test -n "$1"; do
128 128
 			;;
129 129
 		--channel|-c)
130 130
 			shift
131
-			PASSEDPARAM=`echo "${1}" | grep ^-`
132
-			if [ "${PASSEDPARAM}" == "" ]; then
131
+			PASSEDPARAM=`echo "${1}" | grep -v ^-`
132
+			if [ "${PASSEDPARAM}" != "" ]; then
133 133
 				shift;
134
-				CHANNEL="-c \"${PASSEDPARAM}\" ";
134
+				CHANNEL="--channel \"${PASSEDPARAM}\" ";
135 135
 			else
136
-				CHANNEL="-c STABLE ";
136
+				CHANNEL="--channel STABLE ";
137 137
 			fi;
138 138
 			;;
139 139
 	esac
@@ -252,7 +252,8 @@ if [ "" = "${FULLJAR}" ]; then
252 252
 	echo "Building Release Jar"
253 253
 	echo "================================================================"
254 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 257
 	RESULT=${?}
257 258
 	cd ${THISDIR}
258 259
 

Loading…
취소
저장