Changeset 2113 in ProjectBuilder for devel/pb/bin

Timestamp:

Jul 22, 2016, 2:39:48 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Revert tdir cleanup as it was affecting also the remote ftp server !
• Fix gentoo link creation on remote ftp server

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -2403 +2403 @@
 #!/bin/bash
 # Prepare a script to create correct links
+cd $tdir
 for p in $src; do
     echo \$p | grep -q '.ebuild'
     if [ \$\? -eq 0 ]; then
-        pp=`echo \$j | sed 's/-[0-9.]+-r[0-9]*//'`
+        j=`basename \$p`
+        pp=`echo \$j | perl -pe 's/-[0-9\.]+-r[0-9].*\.ebuild/.ebuild/'`
         ln -sf \$j \$pp
     fi
@@ -2583 +2585 @@
             # Nothing to do here
         } else {
-            pb_system("$shcmd \"rm -rf $tdir ; mkdir -p $tdir ; cd $tdir ; $cmd\"","Preparing $tdir on $cptarget");
+            pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done ; $cmd\' | bash -e\"","Preparing $tdir on $cptarget");
         }
     } else {