[builder] do not check if string is contained in append_to_file if doesn't exists

builder

@@ -28,21 +28,22 @@ my $enman_repositories   = $ENV{ENMAN_REPOSITORIES};
 my $prune_virtuals       = $ENV{PRUNE_VIRTUALS} // 0;
 my $repository_name      = $ENV{REPOSITORY_NAME};
 my $enman_add_self       = $ENV{ENMAN_ADD_SELF} // 1;
+my $build_injected_args  = $ENV{BUILD_INJECTED_ARGS};
+my $equo_masks           = $ENV{EQUO_MASKS};
+my $equo_unmasks         = $ENV{EQUO_UNMASKS};
 
 my $make_conf = $ENV{MAKE_CONF};
 
 my @overlays;
-
+my $help = 0;
 GetOptions(
     'layman|overlay:s{,}' => \@overlays,
     'equo|install:s{,}'   => \@equo_install,
-    'equorm|remove:s{,}'  => \@equo_remove
+    'equorm|remove:s{,}'  => \@equo_remove,
+    'help|?'              => \$help
 );
 
-if ( @ARGV == 0 ) {
+help() if $help;
-    help();
-    die();
-}
 
 $ENV{LC_ALL} = "en_US.UTF-8";    #here be dragons
 
@@ -56,6 +57,25 @@ sub safe_call {
     exit($return) if ($rt);
 }
 
+sub append_to_file {
+    my ( $file_name, $package ) = @_;
+
+    if ( -f $file_name ) {
+
+        # Check that the package was not already there
+        open my $fh_ro, '<:encoding(UTF-8)', $file_name or die;
+        while ( my $line = <$fh_ro> ) {
+            return if $line eq $package . "\n";
+        }
+        close $fh_ro;
+    }
+
+    open( my $fh_a, '>>', $file_name )
+      or die "Could not open file '$filename' $!";
+    print $fh_a $package . "\n";
+    close $fh_a;
+}
+
 # Input: package, depth, and atom. Package: sys-fs/foobarfs, Depth: 1 (depth of the package tree) , Atom: 1/0 (enable disable atom output)
 sub package_deps {
     my $package = shift;
@@ -161,6 +181,7 @@ sub help {
 "You can supply multiple overlays as well: $0 plasma-meta --layman kde plab",
       "The documentation is available at https://github.com/Sabayon/devkit",
       "";
+    exit 0;
 }
 
 say "****************************************************";
@@ -192,11 +213,14 @@ system("echo 'y' | layman -f -a $_") for @overlays;
 my $reponame = "LocalOverlay";
 
 # Setting up a local overlay if doesn't exists
+system(
+"rm -rf /usr/local/portage;cp -rf /usr/local/local_portage /usr/local/portage"
+);
+
 if ( !-f "/usr/local/portage/profiles/repo_name" ) {
     system("mkdir -p /usr/local/portage/{metadata,profiles}");
     system("echo 'LocalOverlay' > /usr/local/portage/profiles/repo_name");
     system("echo 'masters = gentoo' > /usr/local/portage/metadata/layout.conf");
-    system("chown -R portage:portage /usr/local/portage");
 }
 else {
     open FILE, "</usr/local/portage/profiles/repo_name";
@@ -205,6 +229,8 @@ else {
     chomp(@FILE);
     $reponame = $FILE[0];
 }
+system("chown -R portage:portage /usr/local/portage");
+system("chmod -R 755 /usr/local/portage");
 
 qx{
 echo '[$reponame]
@@ -262,6 +288,19 @@ qx|echo 'ACCEPT_LICENSE="*"' >> /etc/portage/make.conf|;    #just plain evil
 my @packages = @ARGV;
 
 if ($use_equo) {
+
+    # best effort mask
+    if ($equo_masks) {
+        append_to_file( "/etc/entropy/packages/package.mask", $_ )
+          for ( split( / /, $equo_masks ) );
+    }
+
+    # best effort unmask
+    if ($equo_unmasks) {
+        append_to_file( "/etc/entropy/packages/package.unmask", $_ )
+          for ( split( / /, $equo_unmasks ) );
+    }
+
     my @packages_deps;
     my @Installed_Packages = qx/equo q list installed --quiet/;
     my @Available_Packages = available_packages();
@@ -330,6 +369,12 @@ else {
 
 my $return = $rt >> 8;
 
+# best effort -B
+if ($build_injected_args) {
+    system("emerge $emerge_defaults_args -j $jobs -B $_")
+      for ( split( / /, $build_injected_args ) );
+}
+
 if ($preserved_rebuild) {
 
     system("emerge -j $jobs --buildpkg \@preserved-rebuild");

sabayon-buildpackages

@@ -46,6 +46,8 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -z "${PRUNE_VIRTUALS}" ] || docker_env+=(-e "PRUNE_VIRTUALS=$PRUNE_VIRTUALS")
 [ -z "$REPOSITORY_NAME" ] || docker_env+=(-e "REPOSITORY_NAME=$REPOSITORY_NAME")
 [ -z "$ENMAN_ADD_SELF" ] || docker_env+=(-e "ENMAN_ADD_SELF=$ENMAN_ADD_SELF")
+[ -z "$EQUO_MASKS" ] || docker_env+=(-e "EQUO_MASKS=$EQUO_MASKS")
+[ -z "$EQUO_UNMASKS" ] || docker_env+=(-e "EQUO_UNMASKS=$EQUO_UNMASKS")
 
 if [ -n "$REMOTE_OVERLAY" ]; then
   git clone "$REMOTE_OVERLAY" "$TEMPDIR"
@@ -58,7 +60,7 @@ function cleanup {
 
 trap cleanup EXIT
 
-[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/portage")
+[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
 
 if [ -e $MAKE_CONF ]; then
   echo "You specified a make.conf. I hope you know what are you doing"

sabayon-createrepo

@@ -54,20 +54,24 @@ mkdir -p /sabayon/artifacts
 [[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
 
 if [ -d "/sabayon/artifacts/standard" ]; then
+  echo "=== Repository already exists, syncronizing ==="
   eit unlock \$repo || true
   eit pull --quick \$repo || true
   #eit sync \$repo
 else
+  echo "=== Repository is empty, intializing ==="
   echo "Yes" | eit init --quick \$repo
   eit push --quick --force
 fi
 
-[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { eit key status \$repo; } \
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
-eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; }
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
 
+echo "=== Injecting packages ==="
 echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
 
+echo "=== Pushing built packages locally ==="
 eit push --quick --force
 
 EOF

sabayon-createrepo-cleanup

@@ -25,6 +25,8 @@ docker_volumes=(
             -v "$entropysrv:/etc/entropy/server.conf"
             -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
 
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
 
 check_docker_requirements
 
@@ -46,6 +48,9 @@ else
   echo "ouch no repository there" && exit 3;
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
+
 eit clean --quick || { echo "ouch unable to remove" && exit 3; }
 eit vacuum --quick || { echo "ouch unable to remove" && exit 3; }
 

sabayon-createrepo-remove

@@ -24,7 +24,8 @@ docker_volumes=(
             -v "$createrepo:/sabayon/bin/create_repo.sh"
             -v "$entropysrv:/etc/entropy/server.conf"
             -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
-
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
 
 check_docker_requirements
 
@@ -46,6 +47,9 @@ else
   echo "ouch no repository there" && exit 3;
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
+
 echo "Yes" | eit rm --from \$repo ${args[@]} || { echo "ouch unable to remove" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
 eit push --quick --force