Browse Source

use ln -sf not just ln -s


git-svn-id: http://svn.dmdirc.com/trunk@2869 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack 16 years ago
parent
commit
24963f3023
2 changed files with 10 additions and 10 deletions
  1. 8
    8
      installer/linux/makeInstallerLinux.sh
  2. 2
    2
      installer/release.sh

+ 8
- 8
installer/linux/makeInstallerLinux.sh View File

@@ -149,13 +149,13 @@ fi;
149 149
 
150 150
 if [ "" = "${plugins}" ]; then
151 151
 	echo "Linking jar (${jarfile}).."
152
-	ln -s ${jarfile} "./DMDirc.jar"
152
+	ln -sf ${jarfile} "./DMDirc.jar"
153 153
 else
154 154
 	echo "Copying jar (${jarfile}).."
155 155
 	cp ${jarfile} "./DMDirc.jar"
156 156
 	
157 157
 	echo "Adding plugins to jar"
158
-	ln -s ${jarPath}"/plugins"
158
+	ln -sf ${jarPath}"/plugins"
159 159
 	pluginList=""
160 160
 	for plugin in ${plugins}; do
161 161
 		pluginList=${pluginList}" plugins/${plugin}"
@@ -181,14 +181,14 @@ else
181 181
 fi 
182 182
 
183 183
 if [ -e "../common/installer.jar" ]; then
184
-	ln -s ../common/installer.jar ./installer.jar
184
+	ln -sf ../common/installer.jar ./installer.jar
185 185
 	FILES="${FILES} installer.jar"
186 186
 else
187 187
 	echo "[WARNING] Creating installer-less archive - relying on setup.sh"
188 188
 fi 
189 189
 
190 190
 if [ -e ${jarPath}"/src/com/dmdirc/res/source/logo.svg" ]; then
191
-	ln -s ${jarPath}"/src/com/dmdirc/res/source/logo.svg" ./icon.svg
191
+	ln -sf ${jarPath}"/src/com/dmdirc/res/source/logo.svg" ./icon.svg
192 192
 	FILES="${FILES} icon.svg"
193 193
 fi
194 194
 
@@ -199,20 +199,20 @@ else
199 199
 fi
200 200
 
201 201
 if [ -e "${DOCSDIR}/README.TXT" ]; then
202
-	ln -s "${DOCSDIR}/README.TXT" .
202
+	ln -sf "${DOCSDIR}/README.TXT" .
203 203
 	FILES="${FILES} README.TXT"
204 204
 fi
205 205
 
206 206
 if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
207
-	ln -s "${DOCSDIR}/CHANGES.TXT" .
207
+	ln -sf "${DOCSDIR}/CHANGES.TXT" .
208 208
 	FILES="${FILES} CHANGES.TXT"
209 209
 elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
210
-	ln -s "${DOCSDIR}/CHANGELOG.TXT" .
210
+	ln -sf "${DOCSDIR}/CHANGELOG.TXT" .
211 211
 	FILES="${FILES} CHANGELOG.TXT"
212 212
 fi
213 213
 
214 214
 if [ -e "${jarPath}/launcher/linux" ]; then
215
-	ln -s ${jarPath}/launcher/linux/DMDirc.sh .
215
+	ln -sf ${jarPath}/launcher/linux/DMDirc.sh .
216 216
 	FILES="${FILES} DMDirc.sh"
217 217
 fi
218 218
 

+ 2
- 2
installer/release.sh View File

@@ -130,8 +130,8 @@ echo "Building Installer JAR "
130 130
 echo "================================================================"
131 131
 mkdir -p installer_temp/build
132 132
 cd installer_temp
133
-ln -s ../../src/com
134
-ln -s ../../src/net
133
+ln -sf ../../src/com
134
+ln -sf ../../src/net
135 135
 # I don't know why, but -d doesn't nicely put ALL generated class files here,
136 136
 # just those that were in the dir of the java file that was requested for compile
137 137
 # So we specify each of the different ones we want built into the jar file here.

Loading…
Cancel
Save