Date: Sat, 22 Jun 2013 03:44:49 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252084 - head/usr.sbin/bsdconfig/share/media Message-ID: <201306220344.r5M3in5O062545@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Sat Jun 22 03:44:49 2013 New Revision: 252084 URL: http://svnweb.freebsd.org/changeset/base/252084 Log: Trim the trailing `/' from the ftp_dir when validating that the directory exists on the FTP server. This now means that when you specify a full-path to the repository on the FTP server that it doesn't matter whether you have a trailing `/' or not. Modified: head/usr.sbin/bsdconfig/share/media/ftp.subr Modified: head/usr.sbin/bsdconfig/share/media/ftp.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/media/ftp.subr Sat Jun 22 02:57:52 2013 (r252083) +++ head/usr.sbin/bsdconfig/share/media/ftp.subr Sat Jun 22 03:44:49 2013 (r252084) @@ -659,7 +659,10 @@ f_media_init_ftp() break # to failure fi if echo "$rx" | awk -v dir="/${ftp_dir#/}" ' - BEGIN { found = 0 } + BEGIN { + found = 0 + sub("/$", "", dir) + } /^Remote directory: / { sub(/^[^:]*:[[:space:]]*/, "") if ($0 != dir) next
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306220344.r5M3in5O062545>