Changeset 2333 in ProjectBuilder for devel/pb

Timestamp:

Oct 24, 2017, 12:49:59 AM (7 years ago)

Author:

Bruno Cornec

Message:

Initial support of apk for pb

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -1700 +1700 @@
         } elsif ($pbos->{'type'} eq "hpux") {
             # TODO: HP-UX
+        } elsif ($pbos->{'type'} eq "apk") {
+            # TODO: Alpine
         } else {
             die "Unknown OS type format $pbos->{'type'}";
@@ -3822 +3824 @@
 EOF
     # TODO: Level of portability of these cmds ? Critical now for RM
-    # TODO: Check existence before adding to avoid errors
+    # TODO: use an external parameter
     print SCRIPT << "EOF";
-pb_system("/usr/sbin/groupadd $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
-pb_system("/usr/sbin/useradd -g $pbac->{$ENV{'PBPROJ'}} -m -d $home/$pbac->{$ENV{'PBPROJ'}} $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}})");
+    # Most Linux distros
+    if ( -x "/usr/sbin/groupadd" ) {
+        pb_system("/usr/sbin/groupadd $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
+    # Alpine with busybox
+    } elsif ( -x "/usr/sbin/addgroup" ) {
+        pb_system("/usr/sbin/addgroup $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
+    } else {
+        die "Unable to find a command to add a group on this distribution";
+    }
+    # Most Linux distros
+    if ( -x "/usr/sbin/useradd" ) {
+        pb_system("/usr/sbin/useradd -g $pbac->{$ENV{'PBPROJ'}} -m -d $home/$pbac->{$ENV{'PBPROJ'}} $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}})");
+    # Alpine with busybox
+    } elsif ( -x "/usr/sbin/adduser" ) {
+        pb_system("/usr/sbin/adduser -G $pbac->{$ENV{'PBPROJ'}} -h $home/$pbac->{$ENV{'PBPROJ'}} -D $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$pbac->{$ENV{'PBPROJ'}})");
+    } else {
+        die "Unable to find a command to add a user on this distribution";
+    }
 }
 EOF

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -104 +104 @@
         } elsif ($dtype eq "ebuild") {
             $pbpkgreal = $pbpkg;
+        } elsif ($dtype eq "apk") {
+            $pbpkgreal = $pbpkg;
         } elsif ($dtype eq "hpux") {
             $pbpkgreal = $pbpkg;