Use SF.net pk auth

This commit is contained in:
Reinhard Pointner 2016-04-03 03:58:12 +00:00
parent 1cb29cf14a
commit 59ca09d911
1 changed files with 8 additions and 8 deletions

View File

@ -32,8 +32,8 @@
<property name="basedir.release" location="${basedir}/release" /> <property name="basedir.release" location="${basedir}/release" />
<property name="dir.release" location="${basedir.release}/${title}_${version}" /> <property name="dir.release" location="${basedir.release}/${title}_${version}" />
<property name="dir.cache" location="${basedir}/cache/${title}_${version}" /> <property name="dir.cache" location="${basedir}/cache/${title}_${version}" />
<property name="frs.release" value="web.sourceforge.net:/home/frs/project/f/fi/filebot/filebot" /> <property name="frs.release" value="rednoah,filebot@frs.sourceforge.net:/home/frs/project/f/fi/filebot/filebot" />
<property name="frs.website" value="web.sourceforge.net:htdocs" /> <property name="frs.website" value="rednoah,filebot@web.sourceforge.net:/home/project-web/filebot/htdocs" />
<target name="resolve" description="Retrieve dependencies with Apache Ivy"> <target name="resolve" description="Retrieve dependencies with Apache Ivy">
@ -891,13 +891,13 @@
<target name="deploy-release" depends="stage-release, login" description="Upload to SourceForge.net FRS"> <target name="deploy-release" depends="stage-release, login" description="Upload to SourceForge.net FRS">
<scp todir="${sf.user}:${sf.password}@${frs.release}" trust="yes" verbose="true" sftp="true"> <scp todir="${frs.release}" trust="yes" verbose="true" sftp="true" keyfile="sourceforge_id.key">
<!-- make sure to upload README.md first --> <!-- make sure to upload README.md first -->
<fileset dir="${basedir.release}" includes="**/README.md"> <fileset dir="${basedir.release}" includes="**/README.md">
<date datetime="${tstamp.date}" pattern="yyyy-MM-dd" when="after" /> <date datetime="${tstamp.date}" pattern="yyyy-MM-dd" when="after" />
</fileset> </fileset>
</scp> </scp>
<scp todir="${sf.user}:${sf.password}@${frs.release}" trust="yes" verbose="true" sftp="true"> <scp todir="${frs.release}" trust="yes" verbose="true" sftp="true" keyfile="sourceforge_id.key">
<!-- upload starting with parent folders so scp will create the release folder for us --> <!-- upload starting with parent folders so scp will create the release folder for us -->
<fileset dir="${basedir.release}" excludes="**/README.md"> <fileset dir="${basedir.release}" excludes="**/README.md">
<date datetime="${tstamp.date}" pattern="yyyy-MM-dd" when="after" /> <date datetime="${tstamp.date}" pattern="yyyy-MM-dd" when="after" />
@ -957,7 +957,7 @@
</package-source> </package-source>
<!-- upload --> <!-- upload -->
<scp todir="${sf.user}:${sf.password}@${frs.website}" trust="yes" verbose="true" sftp="true"> <scp todir="${frs.website}" trust="yes" verbose="true" sftp="true" keyfile="sourceforge_id.key">
<fileset dir="${dir.dist}/website"> <fileset dir="${dir.dist}/website">
<modified> <modified>
<param name="cache.cachefile" value="${dir.cache}/scp.properties" /> <param name="cache.cachefile" value="${dir.cache}/scp.properties" />
@ -997,7 +997,7 @@
<target name="upload-data" depends="login"> <target name="upload-data" depends="login">
<scp todir="${sf.user}:${sf.password}@${frs.website}" trust="yes" verbose="true" sftp="true"> <scp todir="${frs.website}" trust="yes" verbose="true" sftp="true" keyfile="sourceforge_id.key">
<fileset dir="${dir.website}"> <fileset dir="${dir.website}">
<include name="data/*.txt" /> <include name="data/*.txt" />
<include name="data/*.xz" /> <include name="data/*.xz" />
@ -1009,8 +1009,8 @@
<target name="deploy-beta-jar" depends="resolve, svn-update, fatjar, login" description="Build and deploy fatjar for the latest revision"> <target name="deploy-beta-jar" depends="resolve, svn-update, fatjar, login" description="Build and deploy fatjar for the latest revision">
<!-- deploy fatjar --> <!-- deploy fatjar -->
<input message="Mark:" addproperty="mark" /> <input message="Mark:" addproperty="mark" />
<scp file="${path.fatjar}" remoteTofile="${sf.user}:${sf.password}@${frs.release}/HEAD/filebot-${version}-r${svn.revision}-${mark}.jar" trust="yes" verbose="true" sftp="true" /> <scp file="${path.fatjar}" remoteTofile="${frs.release}/HEAD/filebot-${version}-r${svn.revision}-${mark}.jar" trust="yes" verbose="true" sftp="true" keyfile="sourceforge_id.key" />
<scp file="${path.fatjar}" remoteTofile="${sf.user}:${sf.password}@${frs.release}/HEAD/FileBot.jar" trust="yes" verbose="true" sftp="true" /> <scp file="${path.fatjar}" remoteTofile="${frs.release}/HEAD/FileBot.jar" trust="yes" verbose="true" sftp="true" keyfile="sourceforge_id.key" />
</target> </target>