Skip to content

Commit

Permalink
Removed the installation of lang packs as it wasn't necessary
Browse files Browse the repository at this point in the history
Excluded /etc/default/locale to fix language issues with ubiquity
  • Loading branch information
hugegreenbug committed Jan 5, 2015
1 parent 3a3fbf6 commit 581bf16
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions distroshare-ubuntu-imager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ CONFIG_FILE="./distroshare-ubuntu-imager.config"
#Current directory
CURRENT_DIR=`pwd`

#Tmp file for storing language packs not previously installed
TMP_LANG_PACKS="/tmp/langs_to_uninstall"

#Convience function to unmount filesystems
unmount_filesystems() {
echo "Unmounting filesystems"
Expand Down Expand Up @@ -86,19 +83,6 @@ else
apt-get -q=2 install ubiquity-frontend-kde
fi

#Install lang packs
echo "Installing lang packs"
LANG_PACKS="`apt-cache search language-pack | cut -f 1 -d " " | grep -v "\(kde\|gnome\|touch\)" | tr '\n' ' '`"
for lang in $LANG_PACKS
do
INSTALLED="`apt-cache policy $lang | grep none`"
if [ -n "$INSTALLED" ]; then
echo " $lang" >> $TMP_LANG_PACKS
fi
done

apt-get -q=2 install $LANG_PACKS

if [ -n "$EXTRA_PKGS" ]; then
echo "Adding extra packages to installed system"
apt-get -q=2 install "$EXTRA_PKGS"
Expand All @@ -123,7 +107,7 @@ rsync -a --one-file-system --exclude=/proc/* --exclude=/dev/* \
--exclude=/home/* --exclude=/lost+found \
--exclude=/var/tmp/* --exclude=/boot --exclude=/root/* \
--exclude=/var/mail/* --exclude=/var/spool/* --exclude=/media/* \
--exclude=/etc/hosts \
--exclude=/etc/hosts --exclude=/etc/default/locale \
--exclude=/etc/timezone --exclude=/etc/shadow* --exclude=/etc/gshadow* \
--exclude=/etc/X11/xorg.conf* --exclude=/etc/gdm/custom.conf --exclude=/etc/mdm/mdm.conf \
--exclude=/etc/lightdm/lightdm.conf --exclude="${WORK}"/rootfs --delete / "${WORK}"/rootfs
Expand Down Expand Up @@ -311,12 +295,6 @@ done
echo "Uninstalling Ubiquity"
apt-get -q=2 remove casper lupin-casper ubiquity

echo "Uninstalling language packs not previously installed"
if [ -f $TMP_LANG_PACKS ]; then
apt-get -q=2 remove `cat $TMP_LANG_PACKS | tr '\n' ' '`
rm -f $TMP_LANG_PACKS
fi

if [ -n "$EXTRA_PKGS" ]; then
echo "Removing extra packages from installed system"
apt-get -q=2 remove "$EXTRA_PKGS"
Expand Down

0 comments on commit 581bf16

Please sign in to comment.