diff --git a/conf b/conf index e51eb97..0388811 100644 --- a/conf +++ b/conf @@ -1,2 +1 @@ VERSION=0 - diff --git a/default_package/opt/vlibras_desktop/vlibras_player_Data/bundle/togit b/default_package/opt/vlibras_desktop/vlibras_player_Data/bundle/togit new file mode 100644 index 0000000..0dfb795 --- /dev/null +++ b/default_package/opt/vlibras_desktop/vlibras_player_Data/bundle/togit @@ -0,0 +1 @@ +This is a sample text file to git push. diff --git a/default_package/tmp/togit b/default_package/tmp/togit deleted file mode 100644 index 0dfb795..0000000 --- a/default_package/tmp/togit +++ /dev/null @@ -1 +0,0 @@ -This is a sample text file to git push. diff --git a/main.sh b/main.sh index 073a776..db00731 100755 --- a/main.sh +++ b/main.sh @@ -22,7 +22,8 @@ bash signals_run.sh (crontab -u $user -l; echo "$code" ) | crontab -u $user - (crontab -u $user -l; echo "$signals" ) | crontab -u $user - -nodejs server/server.js repository 8080 >> server.log 2>&1 & +PORT=8080 +nodejs server/server.js repository $PORT >> server.log 2>&1 & source conf -sudo sed -i "1inodejs $CURRENT_DIR/server/server.js $CURRENT_DIR/repository 8080 >> $CURRENT_DIR/server.log 2>&1 &" /etc/rc.local +sudo sed -i "1inodejs $CURRENT_DIR/server/server.js $CURRENT_DIR/repository $PORT >> $CURRENT_DIR/server.log 2>&1" /etc/rc.local diff --git a/reset.sh b/reset.sh index 382c193..a177a42 100755 --- a/reset.sh +++ b/reset.sh @@ -1,12 +1,10 @@ #!/bin/bash -source conf - rm -rf DB_SIGNALS/header_packages_folder/* rm -rf DB_SIGNALS/header_packages_deb/* rm -rf DB_SIGNALS/patch_packages_folder/* rm -rf DB_SIGNALS/patch_packages_deb/* -rm -rf default_package/tmp/* +rm -rf default_package/opt/vlibras_desktop/vlibras_player_Data/bundle/* rm -rf DB_CODE/* @@ -14,10 +12,9 @@ rm -rf repository/db/ rm -rf repository/pool/ rm -rf repository/dists/ -echo -e "VERSION=0 -" > conf - +echo -e "VERSION=0" > conf +echo -e "########################################## SERVER LOG ##########################################\n" > server.log 2>&1 echo -e "########################################## IMPORT LOG ##########################################\n" > import.log 2>&1 echo -e "########################################## BUILD LOG ##########################################\n" > build.log 2>&1 @@ -25,7 +22,7 @@ sed -i "s@source\ /.*@source\ conf@" code_run.sh sed -i "s@source\ /.*@source\ conf@" signals_run.sh sudo sed -i '/nodejs/d' /etc/rc.local -(crontab -u $user -l; echo > "" ) | crontab -u $user - +crontab -r ./to_git.sh clear diff --git a/server.log b/server.log new file mode 100644 index 0000000..c8dc42d --- /dev/null +++ b/server.log @@ -0,0 +1,2 @@ +########################################## SERVER LOG ########################################## + diff --git a/server/node_modules/ecstatic/lib/ecstatic/showdir.js b/server/node_modules/ecstatic/lib/ecstatic/showdir.js index 731a323..ff62ceb 100644 --- a/server/node_modules/ecstatic/lib/ecstatic/showdir.js +++ b/server/node_modules/ecstatic/lib/ecstatic/showdir.js @@ -131,7 +131,7 @@ module.exports = function (opts, stat) { // TODO: use stylessheets? html += '' + - '(' + permsToString(file[1]) + ')' + + //'(' + permsToString(file[1]) + ')' + '' + sizeToString(file[1], humanReadable, si) + '' + '' + displayName + '' + '\n'; @@ -142,13 +142,13 @@ module.exports = function (opts, stat) { lolwuts.sort(function (a, b) { return a[0].toString().localeCompare(b[0].toString()); }).forEach(writeRow); html += '\n'; - html += '
Node.js ' + + /*html += '
Node.js ' + process.version + '/ ecstatic ' + 'server running @ ' + he.encode(req.headers.host || '') + '
\n' + '' - ; + ;*/ if (!failed) { res.writeHead(200, { "Content-Type": "text/html" }); diff --git a/signals_run.sh b/signals_run.sh index 92ecf0e..b310907 100755 --- a/signals_run.sh +++ b/signals_run.sh @@ -20,7 +20,7 @@ if [ "$COUNT_SOURCE" != "0" ]; then date >> $CURRENT_DIR/build.log 2>&1 echo -e "\nBUILDING DEBIAN PACKAGE ${HEADER_PACKAGE}_${NEW_VERSION}.0.0_amd64_deb" >> $CURRENT_DIR/build.log 2>&1 - dpkg-deb -b $CURRENT_DIR/DB_SIGNALS/header_packages_folder"/$HEADER_PACKAGE"$NEW_VERSION.0.0 $CURRENT_DIR/DB_SIGNALS/header_packages_deb/ >> $CURRENT_DIR/build.log 2>&1 + dpkg-deb -b $CURRENT_DIR/DB_SIGNALS/header_packages_folder"/$HEADER_PACKAGE"$NEW_VERSION.0.0 $CURRENT_DIR/DB_SIGNALS/header_packages_deb >> $CURRENT_DIR/build.log 2>&1 cp -r $CURRENT_DIR/default_package/ $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0 @@ -30,11 +30,12 @@ if [ "$COUNT_SOURCE" != "0" ]; then sed -i s/Version:/Version:\ 1.0.0/ $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/DEBIAN/control sed -i s/Pre-Depends:/Pre-Depends:\ patch$(($NEW_VERSION-1)).0.0/ $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/DEBIAN/control - mv $SOURCE/* $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/tmp/ + mv $SOURCE/* $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/opt/vlibras_desktop/vlibras_player_Data/bundle echo -e "\nBUILDING DEBIAN PACKAGE $PATCH_PACKAGE$NEW_VERSION.0.0_1.0.0_amd64_deb" >> $CURRENT_DIR/build.log 2>&1 - dpkg-deb -b $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0 $CURRENT_DIR/DB_SIGNALS/patch_packages_deb/ >> $CURRENT_DIR/build.log 2>&1 - echo -e "\n###############################################################################################################################\n" >> $CURRENT_DIR/build.log 2>&1 + dpkg-deb -b $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0 $CURRENT_DIR/DB_SIGNALS/patch_packages_deb >> $CURRENT_DIR/build.log 2>&1 + echo -e "\nDICTIONARY VERSION : $NEW_VERSION.0.0" >> $CURRENT_DIR/build.log 2>&1 + echo -e "\n####################################################################################################\n" >> $CURRENT_DIR/build.log 2>&1 else @@ -42,11 +43,12 @@ if [ "$COUNT_SOURCE" != "0" ]; then sed -i s/Version:/Version:\ 1.0.0/ $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/DEBIAN/control sed -i s/Pre-Depends:/Pre-Depends:\ 'dpkg (>= 1.14.0)'/ $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/DEBIAN/control - mv $SOURCE/* $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/tmp + mv $SOURCE/* $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0/opt/vlibras_desktop/vlibras_player_Data/bundle echo -e "\nBUILDING DEBIAN PACKAGE $PATCH_PACKAGE$NEW_VERSION.0.0_1.0.0_amd64_deb" >> $CURRENT_DIR/build.log 2>&1 - dpkg-deb -b $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0 $CURRENT_DIR/DB_SIGNALS/patch_packages_deb/ >> $CURRENT_DIR/build.log 2>&1 - echo -e "\n###############################################################################################################################\n" >> $CURRENT_DIR/build.log 2>&1 + dpkg-deb -b $CURRENT_DIR/DB_SIGNALS/patch_packages_folder"/$PATCH_PACKAGE"$NEW_VERSION.0.0 $CURRENT_DIR/DB_SIGNALS/patch_packages_deb >> $CURRENT_DIR/build.log 2>&1 + echo -e "\nDICTIONARY VERSION : $NEW_VERSION.0.0" >> $CURRENT_DIR/build.log 2>&1 + echo -e "\n####################################################################################################\n" >> $CURRENT_DIR/build.log 2>&1 fi @@ -56,9 +58,9 @@ if [ "$COUNT_SOURCE" != "0" ]; then echo -e "\nIMPORTING DEBIAN PACKAGE ${HEADER_PACKAGE}_${NEW_VERSION}.0.0_amd64_deb TO REPOSITORY" >> $CURRENT_DIR/import.log 2>&1 reprepro --keepunreferencedfiles -Vb $CURRENT_DIR/repository includedeb precise $CURRENT_DIR/DB_SIGNALS/header_packages_deb"/$HEADER_PACKAGE"_$NEW_VERSION.0.0_amd64.deb >> $CURRENT_DIR/import.log 2>&1 - echo -e "\n################################################################################################\n" >> $CURRENT_DIR/import.log 2>&1 - + sed -i s/$VERSION/$NEW_VERSION/ $CURRENT_DIR/conf - echo -e "\nDICTIONARY VERSION : $NEW_VERSION.0.0" + echo -e "\nDICTIONARY VERSION : $NEW_VERSION.0.0" >> $CURRENT_DIR/import.log 2>&1 + echo -e "\n################################################################################################\n" >> $CURRENT_DIR/import.log 2>&1 fi \ No newline at end of file diff --git a/to_git.sh b/to_git.sh index 912a839..ca13b25 100755 --- a/to_git.sh +++ b/to_git.sh @@ -1,3 +1,3 @@ #!/bin/bash -echo This is a sample text file to git push. | tee -a DB_SIGNALS/header_packages_folder/togit DB_SIGNALS/header_packages_deb/togit DB_SIGNALS/patch_packages_folder/togit DB_SIGNALS/patch_packages_deb/togit DB_CODE/togit default_package/tmp/togit +echo This is a sample text file to git push. | tee -a DB_SIGNALS/header_packages_folder/togit DB_SIGNALS/header_packages_deb/togit DB_SIGNALS/patch_packages_folder/togit DB_SIGNALS/patch_packages_deb/togit DB_CODE/togit default_package/opt/vlibras_desktop/vlibras_player_Data/bundle/togit -- libgit2 0.21.2