diff --git a/FAQ.md b/FAQ.md index 0bd23d1..1d6b7ae 100644 --- a/FAQ.md +++ b/FAQ.md @@ -231,7 +231,7 @@ To build a sd card image from another branch than master you follow the [Build t For example if you want to make a build from the 'dev' branch you execute the following command: -`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/build.sdcard/raspbianStretchDesktop.sh && sudo bash raspbianStretchDesktop.sh 'dev'` +`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/build_sdcard.sh && sudo bash build_sdcard.sh 'dev'` ## How can I build an SD card from my forked GitHub Repo? @@ -241,7 +241,7 @@ If you fork the RaspiBlitz repo (much welcome) and you want to run that code on * The long way: If you like to install/remove/change services and system configurations you need to build a SD card from your own code. Prepare like in [Build the SD Card Image](README.md#build-the-sd-card-image) from the README but in the end run the command: -`wget https://raw.githubusercontent.com/[GITHUB-USERNAME]/raspiblitz/[BRANCH]/build.sdcard/raspbianStretchDesktop.sh && sudo bash raspbianStretchDesktop.sh [BRANCH] [GITHUB-USERNAME] +`wget https://raw.githubusercontent.com/[GITHUB-USERNAME]/raspiblitz/[BRANCH]/build_sdcard.sh && sudo bash build_sdcard.sh [BRANCH] [GITHUB-USERNAME] If you are then working in your forked repo and want to update the scripts on your RaspiBlitz with your latest repo changes, run `/home/admin/XXsyncScripts.sh` - thats OK as long as you dont make changes to the sd card build script - then you would need to build a fresh sd card again from your repo. diff --git a/README.md b/README.md index 7238bd2..4f26183 100644 --- a/README.md +++ b/README.md @@ -298,9 +298,9 @@ A ready to use SD card image of the RaspiBlitz for your RaspberryPi is provided Now you are ready to start the SD card build script - copy the following command into your terminal and execute: -`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/master/build.sdcard/raspbianStretchDesktop.sh && sudo bash raspbianStretchDesktop.sh` +`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/master/build_sdcard.sh && sudo bash build_sdcard.sh` -As you can see from the URL you find the build script in this Git repo under `build.sdcard/raspbianStretchDesktop.sh`- there you can check what gets installed and configured in detail. Feel free to post improvements as pull requests. +As you can see from the URL you find the build script in this Git repo under `build_sdcard.sh` - there you can check what gets installed and configured in detail. Feel free to post improvements as pull requests. The whole build process takes a while. At the end the LCD drivers get installed and a reboot is needed. A user `admin` is created during the process. Remember the default password is now `raspiblitz`. You can login per SSH again - this time use admin: `ssh admin@[IP-OF-YOUR-RASPI]`. An installer of the SD card image should automatically launch. If you do not want to continue with the installation at this moment and use this sd card as a template for setting up multiple RaspiBlitze, click `Cancel` and run `/home/admin/XXprepareRelease.sh`. Once you see the LCD going white and the activity LED of the pi starts going dark, you can unplug power and remove the SD card. You have now built your own RaspiBlitz SD card image. diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build_sdcard.sh similarity index 98% rename from build.sdcard/raspbianStretchDesktop.sh rename to build_sdcard.sh index d196fcb..1666086 100644 --- a/build.sdcard/raspbianStretchDesktop.sh +++ b/build_sdcard.sh @@ -1,3 +1,4 @@ + #!/bin/bash ######################################################################### # Build your SD card image based on: @@ -12,7 +13,7 @@ echo "" echo "*****************************************" -echo "* RASPIBLITZ SD CARD IMAGE SETUP v0.99 *" +echo "* RASPIBLITZ SD CARD IMAGE SETUP v1.00 *" echo "*****************************************" echo "" @@ -504,13 +505,12 @@ sudo chmod +x /home/admin/_bootstrap.sh sudo cp ./assets/bootstrap.service /etc/systemd/system/bootstrap.service sudo systemctl enable bootstrap -# *** BOOTSTRAP *** -# see background README for details +# *** TOR Prepare *** +echo "*** Prepare TOR source+keys ***" +sudo /home/admin/config.scripts/internet.tor.sh prepare +echo "If you see fails above .. please run again later on:" +echo "sudo /home/admin/config.scripts/internet.tor.sh prepare" echo "" -echo "*** RASPI BACKGROUND SERVICE ***" -sudo chmod +x /home/admin/_background.sh -sudo cp ./assets/background.service /etc/systemd/system/background.service -sudo systemctl enable background # *** RASPIBLITZ IMAGE READY *** echo "" diff --git a/dietpi/README.md b/dietpi/README.md index b320b31..1d9938c 100644 --- a/dietpi/README.md +++ b/dietpi/README.md @@ -88,7 +88,7 @@ Should end up here on version v6.20.6 or higher: ![](pictures/bash_prompt.png) run the SDcard build script in this format: -`wget https://raw.githubusercontent.com/[GITHUB-USERNAME]/raspiblitz/[BRANCH]/build.sdcard/raspbianStretchDesktop.sh && sudo bash raspbianStretchDesktop.sh [BRANCH] [GITHUB-USERNAME]` +`wget https://raw.githubusercontent.com/[GITHUB-USERNAME]/raspiblitz/[BRANCH]/build_sdcard/raspbianStretchDesktop.sh && sudo bash raspbianStretchDesktop.sh [BRANCH] [GITHUB-USERNAME]` Be aware of that the fork needs to be called `raspiblitz` for the git download to work. if you intend to use @openoms`s forked version: