Skip to content

Commit

Permalink
Update public-suffix.txt.
Browse files Browse the repository at this point in the history
Also, created a mscript to simplify doing this in the future.
  • Loading branch information
LadyCailin committed Dec 18, 2018
1 parent 165f16f commit 4c327a2
Show file tree
Hide file tree
Showing 4 changed files with 537 additions and 514 deletions.
5 changes: 4 additions & 1 deletion src/main/java/com/laytonsmith/core/Static.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1258,7 +1258,10 @@ public static String GetStacktraceString(Throwable t) {
* *
* This generally condenses a 5 or 6 line operation into 1 line. * This generally condenses a 5 or 6 line operation into 1 line.
* *
* @param arg * @param arg The path to parse. May be null.
* @param env The environment, required to properly resolve relative paths.
* @param t Code target, for errors.
* @param def The default file, which is returned if {@code arg} is null. (Maybe also be null).
* @return * @return
*/ */
public static File GetFileFromArgument(String arg, Environment env, Target t, File def) throws ConfigRuntimeException { public static File GetFileFromArgument(String arg, Environment env, Target t, File def) throws ConfigRuntimeException {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/laytonsmith/core/functions/Web.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public Mixed exec(final Target t, final Environment environment, Mixed... args)
settings.setDownloadTo(null); settings.setDownloadTo(null);
} else { // TODO: Remove this check and tie into the VFS once that is complete. } else { // TODO: Remove this check and tie into the VFS once that is complete.
if(Static.InCmdLine(environment)) { if(Static.InCmdLine(environment)) {
File file = new File(download.val()); File file = Static.GetFileFromArgument(Construct.nval(download), environment, t, null);
if(!file.isAbsolute()) { if(!file.isAbsolute()) {
file = new File(t.file(), file.getPath()); file = new File(t.file(), file.getPath());
} }
Expand Down
Loading

0 comments on commit 4c327a2

Please sign in to comment.