Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix 'command substitution: ignored null byte in input' error #4

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: pinguybuilder
Version: 5.1-3
Version: 5.2-1
Architecture: all
Maintainer: pinguy <antoni.norman@gmail.com>
Installed-Size: 11788
Depends: archdetect-deb, memtest86+, coreutils, dialog, mkisofs | genisoimage, findutils, bash, passwd, sed, squashfs-tools, casper, rsync, mount, eject, libdebian-installer4, os-prober, user-setup, discover1 | discover, laptop-detect, syslinux, syslinux-common, util-linux, aufs-tools | unionfs-fuse, dpkg-dev, policykit-1, python (>= 2.7), python (<< 2.8), python-glade2, python-vte, plymouth-x11
Depends: archdetect-deb, memtest86+, coreutils, dialog, mkisofs | genisoimage, findutils, bash, passwd, sed, squashfs-tools, casper, rsync, mount, eject, libdebian-installer4, os-prober, user-setup, discover1 | discover, laptop-detect, syslinux, syslinux-common, util-linux, aufs-tools | unionfs-fuse, dpkg-dev, policykit-1, python (>= 2.7), python (<< 2.8), python-glade2, python-vte, gir1.2-vte-2.91, python-gi, python-gi-cairo, gir1.2-gtk-3.0, plymouth-x11
Section: utils
Priority: optional
Homepage: <insert the upstream URL, if relevant>
Expand Down
Empty file modified DEBIAN/postinst
100644 → 100755
Empty file.
Empty file modified DEBIAN/postrm
100644 → 100755
Empty file.
Empty file modified DEBIAN/preinst
100644 → 100755
Empty file.
Empty file modified DEBIAN/prerm
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion etc/PinguyBuilder/PinguyBuilder.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PinguyBuilderVERSION="5.1-3"
PinguyBuilderVERSION="5.2-1"
Binary file removed pinguybuilder_5.1-8_all.deb
Binary file not shown.
32 changes: 16 additions & 16 deletions usr/bin/PinguyBuilder
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ do_start() {
return \$ES
fi




}

}

case "\$1" in
start)
Expand All @@ -81,14 +81,14 @@ FOO
fi


# load the PinguyBuilder.conf file
# load the PinguyBuilder.conf file
. /etc/PinguyBuilder.conf

# if the PinguyBuilder.conf file is incorrect or missing, make sure to set defaults

if [ "$LIVEUSER" = "" ]; then
#Somebody must have removed the username from the configuration file
echo
echo
#this is a custom live user
LIVEUSER="custom"
fi
Expand All @@ -114,7 +114,7 @@ fi

touch $WORKDIR/PinguyBuilder.log

#added log_msg to reduce size. code provided by Ivailo (a.k.a. SmiL3y)
#added log_msg to reduce size. code provided by Ivailo (a.k.a. SmiL3y)
log_msg() {
echo "$1"
echo "$1" >>$WORKDIR/PinguyBuilder.log
Expand Down Expand Up @@ -187,7 +187,7 @@ case $1 in
echo " sudo PinguyBuilder backup (to make a livecd/dvd backup of your system)"
echo " "
echo " sudo PinguyBuilder backup custom.iso"
echo " (to make a livecd/dvd backup and call the iso custom.iso)"
echo " (to make a livecd/dvd backup and call the iso custom.iso)"
echo " "
echo " sudo PinguyBuilder clean (to clean up temporary files of PinguyBuilder)"
echo " "
Expand Down Expand Up @@ -562,7 +562,7 @@ log_msg "Renaming Distro to $LIVECDLABEL"

#Downloading packages for offline install
log_msg "Downloading packages for CD"

# Check Architecture
ARCH=`archdetect | awk -F "/" '{print $1}'`

Expand All @@ -577,22 +577,22 @@ log_msg "Renaming Distro to $LIVECDLABEL"
cd $WORKDIR/ISOTMP/
dpkg-scanpackages pool /dev/null | gzip -9c > dists/Packages.gz

# check and see if they have a custom isolinux already setup. eg. they copied over
# check and see if they have a custom isolinux already setup. eg. they copied over
# the isolinux folder from their original livecd or made a custom one for their distro

if [ ! -f /etc/PinguyBuilder/customisolinux/isolinux.cfg ]; then
log_msg "Creating isolinux setup for the live system"
find /usr -name 'isolinux.bin' -exec cp {} $WORKDIR/ISOTMP/isolinux/ \;
#find fix for vesamenu.32 provided by Krasimir S. Stefanov <lokiisyourmaster@gmail.com>
VESAMENU=`find /usr -print0 | grep -FzZ "bios/vesamenu.c32"`
cp $VESAMENU $WORKDIR/ISOTMP/isolinux/
LDLINUX=`find /usr -print0 | grep -FzZ "bios/ldlinux.c32"`
VESAMENU=`find /usr -print0 | grep -FzZ "bios/vesamenu.c32" | tr '\0' '\n'`
cp $VESAMENU $WORKDIR/ISOTMP/isolinux/
LDLINUX=`find /usr -print0 | grep -FzZ "bios/ldlinux.c32" | tr '\0' '\n'`
cp $LDLINUX $WORKDIR/ISOTMP/isolinux/
LIBUTIL=`find /usr -print0 | grep -FzZ "bios/libutil.c32"`
LIBUTIL=`find /usr -print0 | grep -FzZ "bios/libutil.c32" | tr '\0' '\n'`
cp $LIBUTIL $WORKDIR/ISOTMP/isolinux/
LIBCOM=`find /usr -print0 | grep -FzZ "bios/libcom32.c32"`
LIBCOM=`find /usr -print0 | grep -FzZ "bios/libcom32.c32" | tr '\0' '\n'`
cp $LIBCOM $WORKDIR/ISOTMP/isolinux/
MENU=`find /usr -print0 | grep -FzZ "bios/menu.c32"`
MENU=`find /usr -print0 | grep -FzZ "bios/menu.c32" | tr '\0' '\n'`
cp $MENU $WORKDIR/ISOTMP/isolinux/
# setup isolinux for the livecd
VERSION=`lsb_release -r | awk '{print $2}' | awk -F "." '{print $1}'`
Expand Down Expand Up @@ -839,7 +839,7 @@ FOO

sleep 1

#checking the size of the compressed filesystem to ensure it meets the iso9660 spec for a single file"
#checking the size of the compressed filesystem to ensure it meets the iso9660 spec for a single file"
SQUASHFSSIZE=`ls -s $WORKDIR/ISOTMP/casper/filesystem.squashfs | awk -F " " '{print $1}'`
if [ "$SQUASHFSSIZE" -gt "3999999" ]; then
log_msg "The compressed filesystem is larger than genisoimage allows for a single file. You must try to reduce the amount of data you are backing up and try again."
Expand Down Expand Up @@ -913,7 +913,7 @@ iso (){
log_msg "The iso was not created. There was a problem. Exiting"
exit 1
fi

# Make the iso hybrid so it can be simply dd copied to a usb flash drive.
log_msg "Making $CUSTOMISO a hybrid iso"
isohybrid --uefi $WORKDIR/$CUSTOMISO
Expand Down
Empty file modified usr/bin/PinguyBuilder-gtk
100644 → 100755
Empty file.
Empty file modified usr/bin/PinguyBuilder-skelcopy
100644 → 100755
Empty file.
Empty file modified usr/bin/plymouth-preview
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: PinguyBuilder-gtk
Version: 5.1-2
Version: 5.2-1
Summary: Ubuntu and variant system remaster. This is the alternate gtk gui for PinguyBuilder written in pygtk.
Home-page: http://pinguyos.com
Author: Tony Brijeski
Expand Down
Loading