mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
- don't include pics folder items in distributable
- correct the template format for mktemp
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -887,6 +887,7 @@
|
|||||||
<include name="res/**" />
|
<include name="res/**" />
|
||||||
<exclude name="res/cardsfolder/**" />
|
<exclude name="res/cardsfolder/**" />
|
||||||
<exclude name="res/lib/**" />
|
<exclude name="res/lib/**" />
|
||||||
|
<exclude name="res/pics/**" />
|
||||||
</fileset>
|
</fileset>
|
||||||
<fileset dir="${project.build.directory}" includes="forge.exe" />
|
<fileset dir="${project.build.directory}" includes="forge.exe" />
|
||||||
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
|
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
|
||||||
@@ -1000,6 +1001,7 @@
|
|||||||
<include name="res/**" />
|
<include name="res/**" />
|
||||||
<exclude name="res/cardsfolder/**" />
|
<exclude name="res/cardsfolder/**" />
|
||||||
<exclude name="res/lib/**" />
|
<exclude name="res/lib/**" />
|
||||||
|
<exclude name="res/pics/**" />
|
||||||
</javafileset>
|
</javafileset>
|
||||||
<javafileset dir="${project.build.directory}">
|
<javafileset dir="${project.build.directory}">
|
||||||
<include name="res/cardsfolder/cardsfolder.zip" />
|
<include name="res/cardsfolder/cardsfolder.zip" />
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ if ! test -z "$BACKGROUND_FILE"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# run applescript
|
# run applescript
|
||||||
APPLESCRIPT=$(mktemp -t createdmg)
|
APPLESCRIPT=$(mktemp -t createdmg.XXXXX)
|
||||||
cat "$AUX_PATH/template.applescript" | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" -e "s/ICON_SIZE/$ICON_SIZE/g" | perl -pe "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" >"$APPLESCRIPT"
|
cat "$AUX_PATH/template.applescript" | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" -e "s/ICON_SIZE/$ICON_SIZE/g" | perl -pe "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" >"$APPLESCRIPT"
|
||||||
|
|
||||||
echo "Running Applescript: /usr/bin/osascript \"${APPLESCRIPT}\" \"${VOLUME_NAME}\""
|
echo "Running Applescript: /usr/bin/osascript \"${APPLESCRIPT}\" \"${VOLUME_NAME}\""
|
||||||
|
|||||||
Reference in New Issue
Block a user