Fixed issue with relative path script

Author: chiknrice

src/main/java/org/codehaus/mojo/rpm/AbstractRPMMojo.java

@@ -773,7 +773,7 @@ public final void execute()
     /**
      * @return The Maven project used by this MOJO
      */
-    private MavenProject getProject()
+    MavenProject getProject()
     {
         if ( project.getExecutionProject() != null )
         {

src/main/java/org/codehaus/mojo/rpm/BaseTrigger.java

@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.shared.utils.io.FileUtils;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -90,16 +89,16 @@ protected String buildScriptletLine( String directive )
     }
 
     /**
-     * Writes the complete trigger directive. Use instead of {@link #write(PrintWriter, String)}.
+     * Writes the complete trigger directive.
      *
      * @param writer {@code PrintWriter} to write the trigger directive to.
-     * @param filterWrappers The filter wrappers to be applied when writing the content.
+     * @param mojo the {@code AbstractRPMMojo} which contains any resources needed when writing the trigger.
      * @throws IOException
      */
-    protected void writeTrigger( PrintWriter writer, final List<FileUtils.FilterWrapper> filterWrappers )
+    protected void writeTrigger( PrintWriter writer, final AbstractRPMMojo mojo )
         throws IOException
     {
-        write( writer, getDirective(), filterWrappers );
+        write( writer, getDirective(), mojo );
     }
 
     /**

src/main/java/org/codehaus/mojo/rpm/Scriptlet.java

@@ -32,7 +32,6 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
-import java.util.List;
 
 /**
  * Defines a scriptlet including the optinal {@link #getSubpackage()} and {@link #getProgram()}. The (optional) contents
@@ -219,18 +218,18 @@ public void setFilter( boolean filter )
      *
      * @param writer {@code PrintWriter} to write content to.
      * @param directive The directive for the scriptlet.
-     * @param filterWrappers The filter wrappers to be applied when writing the content.
+     * @param mojo the {@code AbstractRPMMojo} which contains any resources needed when writing the scriptlet.
      * @throws IOException
      */
     protected final void write( final PrintWriter writer, final String directive,
-                                final List<FileUtils.FilterWrapper> filterWrappers ) throws IOException
+                                final AbstractRPMMojo mojo ) throws IOException
     {
         if ( script != null || scriptFile != null || program != null )
         {
             writer.println();
             writer.println( buildScriptletLine( directive ) );
 
-            writeContent( writer, filterWrappers );
+            writeContent( writer, mojo );
         }
     }
 
@@ -260,7 +259,8 @@ protected String buildScriptletLine( final String directive )
         return builder.toString();
     }
 
-    private Reader getScriptReader( String path ) throws FileNotFoundException, UnsupportedEncodingException
+    private Reader getScriptReader( String path, AbstractRPMMojo mojo ) throws FileNotFoundException,
+            UnsupportedEncodingException
     {
         String classpathPrefix = "classpath:";
         Reader reader;
@@ -278,14 +278,14 @@ private Reader getScriptReader( String path ) throws FileNotFoundException, Unsu
         }
         else
         {
-            File file = new File( path );
+            File file = FileUtils.resolveFile( mojo.getProject().getBasedir(), path );
             if ( !file.exists() )
             {
                 throw new RuntimeException( "Invalid scriptlet declaration found - defined scriptFile does not exist: "
                         + path );
             }
             reader = fileEncoding != null ? new InputStreamReader( new FileInputStream( file ), fileEncoding )
-                    : new FileReader( scriptFile );
+                    : new FileReader( file );
         }
         return reader;
     }
@@ -294,10 +294,10 @@ private Reader getScriptReader( String path ) throws FileNotFoundException, Unsu
      * Writes the content (either {@link #getScript()} or {@link #getScriptFile()}) to <i>writer</i>.
      *
      * @param writer {@code PrintWriter} to write content to.
-     * @param filterWrappers The filter wrappers to be applied when writing the content.
+     * @param mojo the {@code AbstractRPMMojo} which contains any resources needed when writing the scriptlet.
      * @throws IOException
      */
-    protected final void writeContent( PrintWriter writer, final List<FileUtils.FilterWrapper> filterWrappers )
+    protected final void writeContent( PrintWriter writer, final AbstractRPMMojo mojo )
         throws IOException
     {
         if ( script != null )
@@ -306,10 +306,10 @@ protected final void writeContent( PrintWriter writer, final List<FileUtils.Filt
         }
         else if ( scriptFile != null )
         {
-            Reader reader = getScriptReader( scriptFile );
+            Reader reader = getScriptReader( scriptFile, mojo );
             if ( filter )
             {
-                for ( FileUtils.FilterWrapper filterWrapper : filterWrappers )
+                for ( FileUtils.FilterWrapper filterWrapper : mojo.getFilterWrappers() )
                 {
                     reader = filterWrapper.getReader( reader );
                 }

src/main/java/org/codehaus/mojo/rpm/SpecWriter.java

@@ -133,7 +133,7 @@ public void writeSpecFile()
         if ( mojo.getInstallScriptlet() != null )
         {
             spec.println();
-            mojo.getInstallScriptlet().writeContent( spec , mojo.getFilterWrappers() );
+            mojo.getInstallScriptlet().writeContent( spec , mojo );
 
         }
 
@@ -145,7 +145,7 @@ public void writeSpecFile()
         {
             for ( BaseTrigger trigger : mojo.getTriggers() )
             {
-                trigger.writeTrigger( spec, mojo.getFilterWrappers() );
+                trigger.writeTrigger( spec, mojo );
             }
         }
 
@@ -574,7 +574,7 @@ private void writeScripts()
         {
             if ( scriptlets[i] != null )
             {
-                scriptlets[i].write( spec, directives[i], mojo.getFilterWrappers() );
+                scriptlets[i].write( spec, directives[i], mojo );
             }
         }
     }