scripts: sed -i -e 's/;$//g' -e 's/;$/;;/g' on all files

Remove all semicolons that are there just because but aren't needed Also make kernel release script functional Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com>
akhilnarang · Jun 16, 2018 · 463e87e · 463e87e
1 parent e20fa8a
commit 463e87e
Show file tree

Hide file tree

Showing 35 changed files with 523 additions and 527 deletions.
diff --git a/aliases b/aliases
@@ -6,50 +6,50 @@
 # Script with some aliases and exports
 
 if [[ "$(command -v hub)" ]]; then
-    alias git='hub';
+    alias git='hub'
 fi
 
 # SSH aliases
-alias rr='ssh akhil@rr.akhilnarang.me';
-alias aosip='ssh akhil@aosiprom.com';
-alias kronic='ssh kronic@aosiprom.com';
-alias jenkins='ssh ubuntu@jenkins.akhilnarang.me';
+alias rr='ssh akhil@rr.akhilnarang.me'
+alias aosip='ssh akhil@aosiprom.com'
+alias kronic='ssh kronic@aosiprom.com'
+alias jenkins='ssh ubuntu@jenkins.akhilnarang.me'
 alias bot='ssh bot@bot.akhilnarang.me'
-alias downloads='ssh akhil@downloads.akhilnarang.me';
-alias mirror='ssh akhil@mirror.akhilnarang.me';
+alias downloads='ssh akhil@downloads.akhilnarang.me'
+alias mirror='ssh akhil@mirror.akhilnarang.me'
 
 # Miscellaneous aliases
-alias setperf='echo "performance" | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor';
-alias setsave='echo "powersave" | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor';
-alias path='echo ${PATH}';
-alias stopjack='jack-admin stop-server';
+alias setperf='echo "performance" | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor'
+alias setsave='echo "powersave" | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor'
+alias path='echo ${PATH}'
+alias stopjack='jack-admin stop-server'
 
 # https://github.com/AdrianDC/android_development_shell_tools
 # Has some useful stuff :)
-ADCSCRIPT="${HOME}/android_development_shell_tools";
+ADCSCRIPT="${HOME}/android_development_shell_tools"
 if [[ -f "${ADCSCRIPT}/android_development_shell_tools.rc" ]]; then
-    source "${ADCSCRIPT}/android_development_shell_tools.rc";
+    source "${ADCSCRIPT}/android_development_shell_tools.rc"
 fi
 
 # Some PATH changes and stuff only for my laptop
 if [[ "$(hostname)" == "randomness" || "$(hostname)" == "akhil-Lenovo-Y50-70" ]]; then
     # Extend the default PATH a bit
-    export PATH=${HOME}/bin:${HOME}/android-studio/bin:${HOME}/pidcat:${HOME}/Android/Sdk/platform-tools:${HOME}/adb-sync:$PATH;
+    export PATH=${HOME}/bin:${HOME}/android-studio/bin:${HOME}/pidcat:${HOME}/Android/Sdk/platform-tools:${HOME}/adb-sync:$PATH
 
     # Set a custom path for the Android SDK
-    export ANDROID_HOME=${HOME}/Android/Sdk;
+    export ANDROID_HOME=${HOME}/Android/Sdk
 fi
 
 # Set default editor to nano
-export EDITOR="nano";
+export EDITOR="nano"
 
 # Set timezone
-export TZ="Asia/Kolkata";
+export TZ="Asia/Kolkata"
 
 # Colors
-green='\e[0;32m';
-cyan='\e[0;36m';
-red='\e[0;31m';
-lightgray='\e[0;37m';
+green='\e[0;32m'
+cyan='\e[0;36m'
+red='\e[0;31m'
+lightgray='\e[0;37m'
 
 
diff --git a/build-kernel b/build-kernel
@@ -4,61 +4,61 @@
 # SPDX-License-Identifier: GPL-3.0-only
 # Kernel build script
 
-source "${HOME}/scripts/functions";
+source "${HOME}/scripts/functions"
 
 if [[ -z ${KERNELDIR} ]]; then
-    echo -e "Please set KERNELDIR";
-    exit 1;
+    echo -e "Please set KERNELDIR"
+    exit 1
 fi
 
-export DEVICE=whyred;
+export DEVICE=whyred
 #if [[ -z ${DEVICE} ]]; then
-#    export DEVICE="whyred";
+#    export DEVICE="whyred"
 #fi
 
 # These won't change
-export SRCDIR="${KERNELDIR}/${DEVICE}";
-export OUTDIR="${KERNELDIR}/${DEVICE}/obj";
-export ANYKERNEL="${KERNELDIR}/anykernel/${DEVICE}";
-export MODULES_DIR="${ANYKERNEL}/modules/vendor/lib/modules";
-export ARCH="arm64";
-export CCACHE="$(command -v ccache)";
-export CLANG_DIR="${HOME}/clang-build/build";
-export GCC_DIR="${HOME}/build-tools-gcc/aarch64-linux-gnu";
-export CROSS_COMPILE="${GCC_DIR}/bin/aarch64-linux-gnu-";
-export CLANG_TRIPLE="aarch64-linux-gnu-";
-export CC="${CLANG_DIR}/bin/clang";
+export SRCDIR="${KERNELDIR}/${DEVICE}"
+export OUTDIR="${KERNELDIR}/${DEVICE}/obj"
+export ANYKERNEL="${KERNELDIR}/anykernel/${DEVICE}"
+export MODULES_DIR="${ANYKERNEL}/modules/vendor/lib/modules"
+export ARCH="arm64"
+export CCACHE="$(command -v ccache)"
+export CLANG_DIR="${HOME}/clang-build/build"
+export GCC_DIR="${HOME}/build-tools-gcc/aarch64-linux-gnu"
+export CROSS_COMPILE="${GCC_DIR}/bin/aarch64-linux-gnu-"
+export CLANG_TRIPLE="aarch64-linux-gnu-"
+export CC="${CLANG_DIR}/bin/clang"
 export KBUILD_COMPILER_STRING=$(${CC} --version | head -n 1 | perl -pe 's/\(http.*?\)//gs' | sed -e 's/  */ /g' -e 's/[[:space:]]*$//')
-export DEFCONFIG="${DEVICE}_defconfig";
-export ZIP_DIR="${KERNELDIR}/files/${DEVICE}";
-export IMAGE="${OUTDIR}/arch/${ARCH}/boot/Image.gz-dtb";
-export DOWNLOAD_BASE_URL_1="https://downloads.akhilnarang.me/kernel/${DEVICE}/Test/";
-export DOWNLOAD_BASE_URL_2="https://mirror.akhilnarang.me/kernel/${DEVICE}/Test/";
+export DEFCONFIG="${DEVICE}_defconfig"
+export ZIP_DIR="${KERNELDIR}/files/${DEVICE}"
+export IMAGE="${OUTDIR}/arch/${ARCH}/boot/Image.gz-dtb"
+export DOWNLOAD_BASE_URL_1="https://downloads.akhilnarang.me/kernel/${DEVICE}/Test/"
+export DOWNLOAD_BASE_URL_2="https://mirror.akhilnarang.me/kernel/${DEVICE}/Test/"
 
 if [[ -z "${JOBS}" ]]; then
-    JOBS="$(grep -c '^processor' /proc/cpuinfo)";
-    export JOBS;
+    JOBS="$(grep -c '^processor' /proc/cpuinfo)"
+    export JOBS
 fi
 
 if [[ ! -d "${ANYKERNEL}" ]]; then
-    git clone AnyKernel2 -b "${DEVICE}" "${ANYKERNEL}";
+    git clone AnyKernel2 -b "${DEVICE}" "${ANYKERNEL}"
 fi
 
-export MAKE="make O=${OUTDIR}";
+export MAKE="make O=${OUTDIR}"
 
 if [[ -z "${NAME}" ]]; then
-    export NAME="derp";
+    export NAME="derp"
 fi
-NAME="${NAME}-${DEVICE}-$(date +%Y%m%d-%H%M)";
-export NAME;
+NAME="${NAME}-${DEVICE}-$(date +%Y%m%d-%H%M)"
+export NAME
 export ZIPNAME="${NAME}.zip"
 export FINAL_ZIP="${ZIP_DIR}/${ZIPNAME}"
 
 [ ! -d "${ZIP_DIR}" ] && mkdir -pv "${ZIP_DIR}"
 [ ! -d "${OUTDIR}" ] && mkdir -pv "${OUTDIR}"
 
-cd "${SRCDIR}" || exit;
-rm -fv "${IMAGE}";
+cd "${SRCDIR}" || exit
+rm -fv "${IMAGE}"
 
 if [[ "$@" =~ "mrproper" ]]; then
     ${MAKE} mrproper
@@ -69,59 +69,59 @@ if [[ "$@" =~ "clean" ]]; then
 fi
 
 ${MAKE} $DEFCONFIG || (echo "Failed to build with ${DEFCONFIG}, exiting!" && \
-		exit 1);
+		exit 1)
 
-START=$(date +"%s");
-sendTG kronic derp md "Building!";
+START=$(date +"%s")
+sendTG kronic derp md "Building!"
 if [[ "$@" =~ "quiet" ]]; then
     ${MAKE} -j"${JOBS}" CC="$(command -v ccache) ${CC}" CLANG_TRIPLE="${CLANG_TRIPLE}" |& ag -ia "error:|warning:"
 else
-    ${MAKE} -j"${JOBS}" CC="$(command -v ccache) ${CC}" CLANG_TRIPLE="${CLANG_TRIPLE}";
+    ${MAKE} -j"${JOBS}" CC="$(command -v ccache) ${CC}" CLANG_TRIPLE="${CLANG_TRIPLE}"
 fi
-exitCode="$?";
+exitCode="$?"
 END=$(date +"%s")
 DIFF=$((END - START))
-echo -e "Build took $((DIFF / 60)) minute(s) and $((DIFF % 60)) seconds.";
+echo -e "Build took $((DIFF / 60)) minute(s) and $((DIFF % 60)) seconds."
 
 if [[ ! -f "${IMAGE}" ]]; then
-    echo -e "Build failed :P";
-    sendTG kronic derp md "Build failed!";
-    exit 1;
+    echo -e "Build failed :P"
+    sendTG kronic derp md "Build failed!"
+    exit 1
 else
-    echo -e "Build Succesful!";
+    echo -e "Build Succesful!"
 fi
 
-echo -e "Copying kernel image";
-cp -v "${IMAGE}" "${ANYKERNEL}/";
+echo -e "Copying kernel image"
+cp -v "${IMAGE}" "${ANYKERNEL}/"
 
-grep -q "=m" ${OUTDIR}/.config;
+grep -q "=m" ${OUTDIR}/.config
 if [[ "$?" -eq 0 ]]; then
-    find ${OUTDIR} -name "*.ko" -exec cp -v {} ${MODULES_DIR} \;
+    find ${OUTDIR} -name "*.ko" -exec cp -v {} ${MODULES_DIR} \
     for module in $(ls ${MODULES_DIR/*.ko}); do
-  		${CROSS_COMPILE}strip --strip-unneeded "${MODULES_DIR}/${module}";
+  		${CROSS_COMPILE}strip --strip-unneeded "${MODULES_DIR}/${module}"
   	done
 fi # Modules check
-cd - || exit;
-cd "${ANYKERNEL}" || exit;
-zip -r9 "${FINAL_ZIP}" *;
-md5sum ${FINAL_ZIP} | sed -e "s|${ZIP_DIR}||" > ${FINAL_ZIP}.md5sum;
-cd - || exit;
+cd - || exit
+cd "${ANYKERNEL}" || exit
+zip -r9 "${FINAL_ZIP}" *
+md5sum ${FINAL_ZIP} | sed -e "s|${ZIP_DIR}||" > ${FINAL_ZIP}.md5sum
+cd - || exit
 
-if [ -f "$FINAL_ZIP" ];
+if [ -f "$FINAL_ZIP" ]
 then
-echo -e "$NAME zip can be found at $FINAL_ZIP";
+echo -e "$NAME zip can be found at $FINAL_ZIP"
 if [[ "$@" =~ "transfer" ]]; then
-    echo -e "Uploading ${ZIPNAME} to https://transfer.sh/";
-    transfer "${FINAL_ZIP}";
+    echo -e "Uploading ${ZIPNAME} to https://transfer.sh/"
+    transfer "${FINAL_ZIP}"
 fi
 if [[ "$@" =~ "upload" ]]; then
-    echo -e "Uploading ${ZIPNAME}";
-    rsync -av --progress --delete ${ZIP_DIR}/* akhil@downloads.akhilnarang.me:/var/www/downloads.akhilnarang.me/kernel/${DEVICE}/Test/;
-    rsync -av --progress --delete ${ZIP_DIR}/* akhil@mirror.akhilnarang.me:/var/www/mirror.akhilnarang.me/kernel/${DEVICE}/Test/;
-    sendTG kronic derp md "Download ${ZIPNAME} from [Main](${DOWNLOAD_BASE_URL_1}) | [Mirror](${DOWNLOAD_BASE_URL_2})";
+    echo -e "Uploading ${ZIPNAME}"
+    rsync -av --progress --delete ${ZIP_DIR}/* akhil@downloads.akhilnarang.me:/var/www/downloads.akhilnarang.me/kernel/${DEVICE}/Test/
+    rsync -av --progress --delete ${ZIP_DIR}/* akhil@mirror.akhilnarang.me:/var/www/mirror.akhilnarang.me/kernel/${DEVICE}/Test/
+    sendTG kronic derp md "Download ${ZIPNAME} from [Main](${DOWNLOAD_BASE_URL_1}) | [Mirror](${DOWNLOAD_BASE_URL_2})"
 fi
 else
-echo -e "Zip Creation Failed =(";
+echo -e "Zip Creation Failed =("
 fi # FINAL_ZIP check
 
-exit ${exitCode};
+exit ${exitCode}
diff --git a/build-rom/aosip.sh b/build-rom/aosip.sh
@@ -1,40 +1,40 @@
 #!/usr/bin/env bash
 
-if [ -z $1 ];
+if [ -z $1 ]
 then
-DEVICE="oneplus3";
+DEVICE="oneplus3"
 else
-DEVICE=$1;
+DEVICE=$1
 fi
 
 source build/envsetup.sh
 
-if [[ "$2" =~ "clean" ]];
+if [[ "$2" =~ "clean" ]]
 then
 make clean
 fi
 
-if [[ "$2" =~ "dirty" ]];
+if [[ "$2" =~ "dirty" ]]
 then
 make installclean
-outdir="./out/target/product/${DEVICE}";
-  rm -rf "$outdir/combinedroot";
-  rm -rf "$outdir/data";
-  rm -rf "$outdir/recovery";
-  rm -rf "$outdir/root";
-  rm -rf "$outdir/system";
-  rm -rf "$outdir/utilities";
-  rm -rf "$outdir/boot"*;
-  rm -rf "$outdir/combined"*;
-  rm -rf "$outdir/kernel";
-  rm -rf "$outdir/ramdisk"*;
-  rm -rf "$outdir/recovery"*;
-  rm -rf "$outdir/system"*;
-  rm -rf "$outdir/obj/ETC/system_build_prop_intermediates";
-  rm -rf "$outdir/ota_temp/RECOVERY/RAMDISK";
+outdir="./out/target/product/${DEVICE}"
+  rm -rf "$outdir/combinedroot"
+  rm -rf "$outdir/data"
+  rm -rf "$outdir/recovery"
+  rm -rf "$outdir/root"
+  rm -rf "$outdir/system"
+  rm -rf "$outdir/utilities"
+  rm -rf "$outdir/boot"*
+  rm -rf "$outdir/combined"*
+  rm -rf "$outdir/kernel"
+  rm -rf "$outdir/ramdisk"*
+  rm -rf "$outdir/recovery"*
+  rm -rf "$outdir/system"*
+  rm -rf "$outdir/obj/ETC/system_build_prop_intermediates"
+  rm -rf "$outdir/ota_temp/RECOVERY/RAMDISK"
 fi
 
-if [[ "$2" =~ "sync" ]];
+if [[ "$2" =~ "sync" ]]
 then
 time repo sync -c -f -j16 --force-sync --no-clone-bundle --no-tags
 fi
@@ -52,10 +52,10 @@ lunch aosip_${DEVICE}-userdebug
 time mka kronic
 if [ $? -eq 0 ]; then
   cd $OUT
-  AOSIP_ZIP="$(ls AOSiP*.zip)";
-  rsync -av "${AOSIP_ZIP}" "akhil@aosiprom.com:/home/kronic/aosiprom.com/.dothidden/akhil/${DEVICE}/";
-  cd -;
-  DOWNLOAD_URL="http://aosiprom.com/.dothidden/akhil/${DEVICE}/${AOSIP_ZIP}";
+  AOSIP_ZIP="$(ls AOSiP*.zip)"
+  rsync -av "${AOSIP_ZIP}" "akhil@aosiprom.com:/home/kronic/aosiprom.com/.dothidden/akhil/${DEVICE}/"
+  cd -
+  DOWNLOAD_URL="http://aosiprom.com/.dothidden/akhil/${DEVICE}/${AOSIP_ZIP}"
   bash ~/kronicbot/aosip_testers.sh "[$AOSIP_ZIP](${DOWNLOAD_URL})"
   if [[ "${DEVICE}" = "oneplus3" ]]; then
     bash ~/kronicbot/3_t_testers.sh "[$AOSIP_ZIP](${DOWNLOAD_URL})"

diff --git a/build-rom/aosp-caf.sh b/build-rom/aosp-caf.sh
@@ -6,16 +6,16 @@
 # android_shell_tools is from https://github.com/AdrianDC/android_shell_tools
 
 source /home/akhil/android_shell_tools/android_bash.rc
-bashsync;
-if [ "${REPOSYNC}" == "yes" ];
+bashsync
+if [ "${REPOSYNC}" == "yes" ]
 then
 rm -rf .repo/local_manifests 2>/dev/null
 mkdir -v .repo/local_manifests
 cd .repo/local_manifests
 wget https://raw.githubusercontent.com/akhilnarang/local_manifests/master/${DEVICE}.xml
-if [ ! -f "${DEVICE}.xml" ];
+if [ ! -f "${DEVICE}.xml" ]
 then
-exit 1;
+exit 1
 fi
 cd -
 time reposy -j32

diff --git a/build-rom/arch-upload-bitly.sh b/build-rom/arch-upload-bitly.sh
@@ -20,7 +20,7 @@ source ../.credentials
 breakfast $1
 
 # 2nd parameter. Pass a target to be made, like clean, clobber, dirty, installclean, etc. If none, will delete old zips, build.prop, kernel's .version
-if [ $2 ];
+if [ $2 ]
 then
 mka $2
 else
@@ -34,11 +34,11 @@ export TARGET_UNOFFICIAL_BUILD_ID=$rom
 [ ! -d logs ] || mkdir logs
 
 # Check for target to be built
-if [ $(grep ^bacon build/core/Makefile) ];
+if [ $(grep ^bacon build/core/Makefile) ]
 then
-makecommand=bacon;
+makecommand=bacon
 else
-makecommand=otapackage;
+makecommand=otapackage
 fi
 
 # Build ang log output
@@ -61,12 +61,12 @@ echo $bitlyarg1
 
 # Another script, which uses bitly.com API to make a short url :).
 bitly $bitlyarg1
-echo "";
+echo ""
 
 # Again, related to my serving of files directly from the server
 #bitlyarg2="${phoenixlink}${path}${zip}"
 #echo $bitlyarg2
 #bitly $bitlyarg2
-#echo "";
-echo "md5sum is $(md5sum $pathzip | awk '{print $1}')";
+#echo ""
+echo "md5sum is $(md5sum $pathzip | awk '{print $1}')"
 figlet thuglife