diff --git a/helpers/make-firefox b/helpers/make-firefox index 0e03f65291d60af563e04df9b0ebc81048bf5e12..930c86980c44f11f381c9864e0e3d91e0c2e30c8 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -78,7 +78,7 @@ sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.i find -type d | grep firefox | xargs rename s/firefox/abrowser/ find -type f | grep firefox | xargs rename s/firefox/abrowser/ replace(){ -find $3 -type f |grep -v changelog |grep -v copyright | xargs sed -i s^"$1"^"$2"^g +find $3 -type f |grep -v changelog |grep -v copyright | xargs -i sed -i s^"$1"^"$2"^g "{}" } replace firefox abrowser . replace Firefox Abrowser . diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity index ace1e45ab216442fe26fb9d57c6bd1eec77a9403..57d678e7699d37d7bcd810aaa0672b8688e0d4ab 100644 --- a/helpers/make-ubiquity +++ b/helpers/make-ubiquity @@ -25,7 +25,7 @@ cp $DATA/trisquel_installed.png pixmaps rm pixmaps/ubuntu_installed.png replace ubuntu_installed trisquel_installed . -sed '/canonical/d' -i debian/ubiquity.install* +/bin/sed '/canonical/d' -i debian/ubiquity.install* rm tests/test_ubi_partman* export DEB_BUILD_OPTIONS=nocheck @@ -35,7 +35,7 @@ sed 's:\(targetdb)\):\1\n os.system("sudo chmod 644 /target/var/cache/deb for i in $(ls -1 d-i/source/apt-setup/generators |grep -v 01setup) canonical.com security.ubuntu.com extras.ubuntu.com do - sed /$i/d -i debian/ubiquity.install-any d-i/source/apt-setup/debian/*.install + /bin/sed /$i/d -i debian/ubiquity.install-any d-i/source/apt-setup/debian/*.install done echo "d-i/source/apt-setup/generators/99trisquel usr/lib/ubiquity/apt-setup/generators" >> debian/ubiquity.install-any @@ -102,8 +102,9 @@ replace archive.ubuntu.com/ubuntu archive.trisquel.info/trisquel . replace security.ubuntu.com/trisquel archive.trisquel.info/trisquel . replace archive.ubuntu.com archive.trisquel.info . replace security.ubuntu.com archive.trisquel.info . -sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py scripts/check-kernels -sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui +#sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py +sed -i 's/apt-install/true #apt-install/' scripts/check-kernels +#sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui rm -rf d-i/source/apt-setup/release-files/* for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports