Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
b22c955e
Commit
b22c955e
authored
12 years ago
by
Ruben Rodriguez
Browse files
Options
Downloads
Patches
Plain Diff
Changed makepackage to make subscripts use bash instead o sh
parent
5ad5bd07
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
makepackage
+5
-5
5 additions, 5 deletions
makepackage
with
5 additions
and
5 deletions
makepackage
+
5
−
5
View file @
b22c955e
#!/bin/sh
#!/bin/
ba
sh
#
# Copyright (C) 2011 Ruben Rodriguez <ruben@trisquel.info>
#
...
...
@@ -147,7 +147,7 @@ EOF
[
-f
$CHROOT
/
$BIN
]
||
continue
mv
$CHROOT
/
$BIN
$CHROOT
/
$BIN
.orig
cat
<<
EOF
>
$CHROOT
/
$BIN
#!/bin/sh
#!/bin/
ba
sh
if [
\$
# -eq 0 ]
then
...
...
@@ -178,7 +178,7 @@ done
apt-get --force-yes -y dist-upgrade
umount /proc
EOF
chroot
jails/
$UPSTREAM
-
$ARCH
sh /tmp/update
chroot
jails/
$UPSTREAM
-
$ARCH
ba
sh /tmp/update
if
[
-f
jails/
$UPSTREAM
-
$ARCH
/CurrentlyBuilding
]
then
echo
The
$UPSTREAM
-
$ARCH
jail appears to be running
$(
cat
jails/
$UPSTREAM
-
$ARCH
/CurrentlyBuilding |grep Package: |sed
's/Package:\ //'
)
, aborting.
...
...
@@ -206,7 +206,7 @@ tmpmount
cp
-a
helpers/ jails/
$UPSTREAM
-
$ARCH
/
$WORKDIR
/
cat
<<
EOF
> jails/
$UPSTREAM
-
$ARCH
/usr/local/sbin/makepackage-handler
#!/bin/sh
#!/bin/
ba
sh
WORKDIR=
$WORKDIR
PACKAGE=
$PACKAGE
cd
$WORKDIR
...
...
@@ -214,7 +214,7 @@ cd $WORKDIR
[ -d PACKAGES ] || mkdir PACKAGES
export LD_PRELOAD="
${
LD_PRELOAD
:+
$LD_PRELOAD
:
}
/usr/lib/libeatmydata/libeatmydata.so"
export PATH="/usr/lib/ccache:
${
PATH
}
"
sh -e make-
$PACKAGE
2>&1 || exit 1
ba
sh -e make-
$PACKAGE
2>&1 || exit 1
EOF
cat
<<
EOF
> jails/
$UPSTREAM
-
$ARCH
/etc/pkgbinarymangler/striptranslations.conf
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment