Raspi2-3_GenImage Commit - r392:b6015bf25ad2 · Collaboration Tremplin des Sciences

250

fi

250

fi

251

252

#sed and cut the result string so we can use it as APT_SERVER

252

#sed and cut the result string so we can use it as APT_SERVER

253

253

254

APT_SERVER=${~~APT_SERVER~~::-1}

254

APT_SERVER=${tmp:0:-1}

255

256

#make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!

256

#make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!

257

if [ -n "$SET_ARCH" ] ; then

257

if [ -n "$SET_ARCH" ] ; then

426

427

# Check if all required packages are installed on the build system

427

# Check if all required packages are installed on the build system

428

for package in $REQUIRED_PACKAGES ; do

428

for package in $REQUIRED_PACKAGES ; do

429

if [ "$(dpkg-query -W -f='${Status}' $package)" != "install ok installed" ] ; then

429

if [ "$(dpkg-query -W -f='${Status}' "$package")" != "install ok installed" ] ; then

430

MISSING_PACKAGES="${MISSING_PACKAGES} $package"

430

MISSING_PACKAGES="${MISSING_PACKAGES} $package"

431

fi

431

fi

432

done

432

done

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             fi
             #sed and cut the result string so we can use it as APT_SERVER
-            APT_SERVER=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut -d ' ' -f 3)
+            tmp=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut -d ' ' -f 3)
-            APT_SERVER=${APT_SERVER::-1}
+            APT_SERVER=${tmp:0:-1}
             #make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!
             if [ -n "$SET_ARCH" ] ; then
             # Check if all required packages are installed on the build system
             for package in $REQUIRED_PACKAGES ; do
-              if [ "$(dpkg-query -W -f='${Status}' $package)" != "install ok installed" ] ; then
+              if [ "$(dpkg-query -W -f='${Status}' "$package")" != "install ok installed" ] ; then
                 MISSING_PACKAGES="${MISSING_PACKAGES} $package"
               fi
             done